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