Nick Mathewson 6ba8afe5f8 Merge remote-tracking branch 'teor/feature15775-fallback-v9-squashed' %!s(int64=8) %!d(string=hai) anos
..
common aba39ea390 Merge branch 'feature8195_small_squashed' %!s(int64=8) %!d(string=hai) anos
config 9c66afe772 Merge branch 'maint-0.2.6' into maint-0.2.7 %!s(int64=8) %!d(string=hai) anos
ext 824a6a2a90 Replace usage of INLINE with inline %!s(int64=8) %!d(string=hai) anos
or 6ba8afe5f8 Merge remote-tracking branch 'teor/feature15775-fallback-v9-squashed' %!s(int64=8) %!d(string=hai) anos
test 6ba8afe5f8 Merge remote-tracking branch 'teor/feature15775-fallback-v9-squashed' %!s(int64=8) %!d(string=hai) anos
tools 54565ca804 Remove -F from tor-resolve(1) usage message. %!s(int64=8) %!d(string=hai) anos
trunnel 49ccb7e7b8 Mention trunnel in CodingStandards; describe how in trunnel/README %!s(int64=8) %!d(string=hai) anos
win32 551dba3290 Bump master to 0.2.8.0-alpha-dev %!s(int64=8) %!d(string=hai) anos
include.am 3b7d0ed08e Use trunnel for crypto_pwbox encoding/decoding. %!s(int64=9) %!d(string=hai) anos