Nick Mathewson 61612f980d Merge branch 'maint-0.2.9' %!s(int64=7) %!d(string=hai) anos
..
common 957bdc4a42 Merge branch 'bug20553_028' %!s(int64=7) %!d(string=hai) anos
config 7410adb330 Merge branch 'maint-0.2.8' %!s(int64=7) %!d(string=hai) anos
ext 206a9726b1 Regenerate trunnel code with trunnel 1.5 %!s(int64=7) %!d(string=hai) anos
or f45a581486 Fix some 32-bit warnings and clang warnings %!s(int64=7) %!d(string=hai) anos
test 61612f980d Merge branch 'maint-0.2.9' %!s(int64=7) %!d(string=hai) anos
tools 957bdc4a42 Merge branch 'bug20553_028' %!s(int64=7) %!d(string=hai) anos
trunnel c35c43d7d9 Merge branch 'ticket17238_029_02-resquash' %!s(int64=7) %!d(string=hai) anos
win32 e12560db76 Bump version on master to 0.3.0.0-alpha-dev. %!s(int64=7) %!d(string=hai) anos
include.am 3b7d0ed08e Use trunnel for crypto_pwbox encoding/decoding. %!s(int64=9) %!d(string=hai) anos