Nick Mathewson b915b6cd21 Merge remote-tracking branch 'github/prop297'		2018-12-11 09:44:57 -05:00
..
app	Merge branch 'maint-0.3.5'	2018-12-11 09:41:05 -05:00
config	Merge branch 'maint-0.3.5'	2018-12-06 09:26:34 -05:00
core	Merge remote-tracking branch 'github/prop297'	2018-12-11 09:44:57 -05:00
ext	Add .may_include to ext/timeouts.	2018-11-14 16:07:36 -05:00
feature	Merge remote-tracking branch 'github/prop297'	2018-12-11 09:44:57 -05:00
lib	Merge remote-tracking branch 'tor-github/pr/508'	2018-12-05 08:19:02 -05:00
rust	Merge remote-tracking branch 'tor-github/pr/508'	2018-12-05 08:19:02 -05:00
test	Merge remote-tracking branch 'public/prop298'	2018-12-05 09:43:03 -05:00
tools	Use tor_strdup() in place of malloc+strncpy+terminate.	2018-12-01 20:46:06 -05:00
trunnel	Allow socks4_server_reply version to be 0 (for tor-resolve)	2018-12-01 14:31:17 -05:00
win32	Bump to 0.3.5.5-alpha-dev	2018-11-16 11:32:04 -05:00
include.am	Move buffers.c out of lib/containers to resolve a circularity.	2018-11-14 16:07:03 -05:00