Nick Mathewson a034863b45 Merge remote-tracking branch 'public/bug12509_025' 9 éve
..
common cf2ac8e255 Merge remote-tracking branch 'public/feature11791' 9 éve
config b4ead16d57 Merge remote-tracking branch 'origin/maint-0.2.5' 9 éve
ext f54e54b0b4 Bump copyright dates to 2015, in case someday this matters. 9 éve
or a034863b45 Merge remote-tracking branch 'public/bug12509_025' 9 éve
test cf2ac8e255 Merge remote-tracking branch 'public/feature11791' 9 éve
tools f54e54b0b4 Bump copyright dates to 2015, in case someday this matters. 9 éve
trunnel 9fd6fbec28 Regenerate pwbox.c with the latest trunnel 9 éve
win32 563bb1ad81 Bump version to 0.2.6.2-alpha-dev 9 éve
include.am 3b7d0ed08e Use trunnel for crypto_pwbox encoding/decoding. 9 éve