Nick Mathewson df5c81fec0 Merge branch 'bug32765_041' into bug32771_042		2019-12-16 15:27:18 -05:00
..
app	Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1	2019-10-22 12:11:50 -04:00
config	Merge branch 'maint-0.4.1' into maint-0.4.2	2019-12-06 16:02:08 -05:00
core	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-11-25 12:37:07 +10:00
ext	Coverity: different implementation for csiphash	2019-06-28 12:07:38 -04:00
feature	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-11-25 12:37:07 +10:00
lib	Merge branch 'bug32765_041' into bug32771_042	2019-12-16 15:27:18 -05:00
rust	Bug 31356: Bump protover for new padding machines	2019-08-12 14:02:35 -05:00
test	Merge branch 'maint-0.4.0' into maint-0.4.1	2019-12-05 10:14:01 +10:00
tools	Make tor-print-ed-signing-cert output RFC1123 and unix timestamps as well	2019-07-10 11:36:26 +03:00
trunnel	Merge remote-tracking branch 'tor-github/pr/1303' into maint-0.4.1	2019-10-22 12:15:06 -04:00
win32	bump to 0.4.2.5-dev	2019-12-09 16:03:31 -05:00
include.am	Move unit-parsing code to src/lib/confmgt	2019-06-24 15:11:57 -04:00