Nick Mathewson 8a15d0f69b Merge branch 'maint-0.3.5'		2018-11-26 17:25:28 -05:00
..
app	Add options to control dormant-client feature.	2018-11-26 16:32:40 -05:00
config	Merge branch 'maint-0.3.5'	2018-11-11 11:57:54 -05:00
core	Merge remote-tracking branch 'tor-github/pr/495'	2018-11-26 17:17:40 -05:00
ext	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-09-13 11:46:04 -04:00
feature	Merge branch 'dormant_v2_squashed'	2018-11-26 16:33:31 -05:00
lib	Merge branch 'maint-0.3.5'	2018-11-26 17:25:28 -05:00
rust	Merge branch 'maint-0.3.5'	2018-11-15 16:11:29 -05:00
test	Merge remote-tracking branch 'tor-github/pr/539'	2018-11-26 17:22:37 -05:00
tools	Add missing library to build tor-print-ed-signing-cert.	2018-11-19 10:18:44 -05:00
trunnel	Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged	2018-07-12 11:47:25 -04:00
win32	Bump to 0.3.5.5-alpha-dev	2018-11-16 11:32:04 -05:00
include.am	Move the code that knows our tor version into a lowest-level lib	2018-11-05 09:22:02 -05:00