Nick Mathewson f6420bceec Merge branch 'maint-0.2.5' into maint-0.2.6 7 rokov pred
..
common f6420bceec Merge branch 'maint-0.2.5' into maint-0.2.6 7 rokov pred
config 3913f959e3 Merge branch 'maint-0.2.5' into maint-0.2.6 7 rokov pred
ext c113544a94 Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6 9 rokov pred
or 3de27618e6 Merge branch 'maint-0.2.5' into maint-0.2.6 7 rokov pred
test f6420bceec Merge branch 'maint-0.2.5' into maint-0.2.6 7 rokov pred
tools f75ca04520 Tweak tor-resolve docs and logs 9 rokov pred
trunnel 9fd6fbec28 Regenerate pwbox.c with the latest trunnel 9 rokov pred
win32 95a88f7283 Add -dev to version number. 7 rokov pred
include.am 3b7d0ed08e Use trunnel for crypto_pwbox encoding/decoding. 9 rokov pred