Nick Mathewson 95a88f7283 Add -dev to version number. %!s(int64=8) %!d(string=hai) anos
..
common e6965f78b8 Merge branch 'maint-0.2.5' into maint-0.2.6 %!s(int64=8) %!d(string=hai) anos
config 159ddf6dde Merge branch 'maint-0.2.5' into maint-0.2.6 %!s(int64=8) %!d(string=hai) anos
ext c113544a94 Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6 %!s(int64=10) %!d(string=hai) anos
or 40bccc2004 Merge branch 'maint-0.2.5' into maint-0.2.6 %!s(int64=8) %!d(string=hai) anos
test e0b7598833 Repair breakage in early-error case of microdesc parsing %!s(int64=10) %!d(string=hai) anos
tools f75ca04520 Tweak tor-resolve docs and logs %!s(int64=10) %!d(string=hai) anos
trunnel 9fd6fbec28 Regenerate pwbox.c with the latest trunnel %!s(int64=11) %!d(string=hai) anos
win32 95a88f7283 Add -dev to version number. %!s(int64=8) %!d(string=hai) anos
include.am 3b7d0ed08e Use trunnel for crypto_pwbox encoding/decoding. %!s(int64=11) %!d(string=hai) anos