Nick Mathewson 48b08f0592 Merge branch 'ticket27359_v2_squashed' %!s(int64=7) %!d(string=hai) anos
..
app 91355c0fac Annotate subsystem list with their levels. %!s(int64=7) %!d(string=hai) anos
config e27dff08a3 Merge branch 'maint-0.3.5' %!s(int64=7) %!d(string=hai) anos
core 48b08f0592 Merge branch 'ticket27359_v2_squashed' %!s(int64=7) %!d(string=hai) anos
ext d44eb16b23 Merge branch 'maint-0.3.4' %!s(int64=7) %!d(string=hai) anos
feature 48b08f0592 Merge branch 'ticket27359_v2_squashed' %!s(int64=7) %!d(string=hai) anos
lib a6a7a1f3ed Merge branch 'maint-0.3.5' %!s(int64=7) %!d(string=hai) anos
rust 31cc0d2c0b Merge branch 'maint-0.3.5' %!s(int64=7) %!d(string=hai) anos
test 48b08f0592 Merge branch 'ticket27359_v2_squashed' %!s(int64=7) %!d(string=hai) anos
tools eba989bf0e Merge branch 'maint-0.3.4' into maint-0.3.5 %!s(int64=7) %!d(string=hai) anos
trunnel 7556933537 Merge branch 'socks_trunnel4_squashed' into socks_trunnel4_squashed_merged %!s(int64=7) %!d(string=hai) anos
win32 9e48d9a920 Change version on master to 0.4.0.0-alpha-dev. %!s(int64=7) %!d(string=hai) anos
include.am 6e7ff8cba0 Move the code that knows our tor version into a lowest-level lib %!s(int64=7) %!d(string=hai) anos