Nick Mathewson 1ae9116601 Merge remote-tracking branch 'onionk/rust-protocommas1' into maint-0.3.5 %!s(int64=5) %!d(string=hai) anos
..
app 67351f6724 Merge remote-tracking branch 'tor-github/pr/380' %!s(int64=5) %!d(string=hai) anos
config a23c36ebcd Merge branch 'maint-0.3.4' %!s(int64=5) %!d(string=hai) anos
core b1891068f1 Merge branch 'maint-0.3.4' %!s(int64=5) %!d(string=hai) anos
ext d44eb16b23 Merge branch 'maint-0.3.4' %!s(int64=5) %!d(string=hai) anos
feature 7f6c0fce46 Merge branch 'bug27800-034' into bug27800-035 %!s(int64=5) %!d(string=hai) anos
lib 8b3ec74e5f Merge remote-tracking branch 'public/bug27990' %!s(int64=5) %!d(string=hai) anos
rust 1ae9116601 Merge remote-tracking branch 'onionk/rust-protocommas1' into maint-0.3.5 %!s(int64=5) %!d(string=hai) anos
test 7f6c0fce46 Merge branch 'bug27800-034' into bug27800-035 %!s(int64=5) %!d(string=hai) anos
tools 8a0b741487 Add a tor_free() in tor_gencert to fix a coverity warning %!s(int64=5) %!d(string=hai) anos
trunnel 7556933537 Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged %!s(int64=5) %!d(string=hai) anos
win32 389bae0e8b Bump to 0.3.5.3-alpha-dev %!s(int64=5) %!d(string=hai) anos
include.am c8f2a6d2fe Extract the non-stats part of geoip into a new src/lib/geoip. %!s(int64=5) %!d(string=hai) anos