Nick Mathewson 1547fd99a6 Merge branch 'bug28656_035_squashed' into maint-0.4.0		2019-03-15 08:59:19 -04:00
..
app	Merge remote-tracking branch 'tor-github/pr/726' into maint-0.4.0	2019-02-26 07:27:42 -05:00
config	Merge branch 'maint-0.3.5' into maint-0.4.0	2019-03-06 14:29:43 -05:00
core	Merge remote-tracking branch 'tor-github/pr/791' into maint-0.4.0	2019-03-15 08:52:50 -04:00
ext	Bump copyright date to 2019	2019-01-16 12:33:22 -05:00
feature	Merge branch 'bug28656_035_squashed' into maint-0.4.0	2019-03-15 08:59:19 -04:00
lib	Merge branch 'tor-github/pr/763' into maint-0.4.0	2019-03-12 18:11:35 +02:00
rust	protover: Add missing Padding to translate_to_rust	2019-03-05 12:33:43 -05:00
test	Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0	2019-03-15 08:54:30 -04:00
tools	Bump copyright date to 2019	2019-01-16 12:33:22 -05:00
trunnel	Add padding negotiation trunnel output.	2019-01-02 15:12:20 +02:00
win32	Bump to 0.4.0.2-alpha-dev	2019-02-21 13:25:33 -05:00
include.am	Move buffers.c out of lib/containers to resolve a circularity.	2018-11-14 16:07:03 -05:00