Nick Mathewson 583df33e20 Merge branch 'maint-0.3.4'		2018-07-20 10:42:29 -04:00
..
app	Merge branch 'maint-0.3.4'	2018-07-19 14:34:26 -04:00
config	Merge branch 'maint-0.2.9' into maint-0.3.2	2018-07-09 09:11:41 -04:00
core	wrap a multi-line if body in { } before somebody gets hurt	2018-07-18 21:23:35 -04:00
ext	Fix forking tests on Windows when there is a space in the path.	2018-07-13 12:46:18 +02:00
feature	Merge branch 'maint-0.3.4'	2018-07-20 10:42:29 -04:00
lib	Merge branch 'bug26712'	2018-07-19 12:20:13 -04:00
rust	Add two more dependencies in build.rs	2018-07-18 16:20:31 -04:00
test	Merge branch 'maint-0.3.4'	2018-07-19 08:32:00 -04:00
tools	Rename torlog.[ch] to log.[ch]	2018-07-10 15:20:30 -04: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.4.4-rc-dev	2018-07-09 15:17:38 -04:00
include.am	Start splitting src/or	2018-07-05 17:15:50 -04:00