Nick Mathewson 5823e62fa2 Merge branch 'maint-0.3.4' %!s(int64=5) %!d(string=hai) anos
..
app 3c49019016 Merge branch 'maint-0.3.4' %!s(int64=5) %!d(string=hai) anos
config 1af69c1812 Merge branch 'maint-0.3.3' into maint-0.3.4 %!s(int64=6) %!d(string=hai) anos
core 144fc9bef1 wrap a multi-line if body in { } before somebody gets hurt %!s(int64=5) %!d(string=hai) anos
ext 46501cdd18 Fix forking tests on Windows when there is a space in the path. %!s(int64=6) %!d(string=hai) anos
feature 9ae3597540 Tweak assertion in get_time_period_length() for coverity %!s(int64=5) %!d(string=hai) anos
lib 5823e62fa2 Merge branch 'maint-0.3.4' %!s(int64=5) %!d(string=hai) anos
rust 42c02097db Add two more dependencies in build.rs %!s(int64=5) %!d(string=hai) anos
test b44fce6716 Merge branch 'maint-0.3.4' %!s(int64=5) %!d(string=hai) anos
tools e7f5f48d68 Rename torlog.[ch] to log.[ch] %!s(int64=6) %!d(string=hai) anos
trunnel 7556933537 Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged %!s(int64=6) %!d(string=hai) anos
win32 e22822e4ae Bump master to 0.3.5.0-alpha-dev %!s(int64=6) %!d(string=hai) anos
include.am 81cb0afb2b Start splitting src/or %!s(int64=6) %!d(string=hai) anos