Nick Mathewson 5d4bb6f61f Merge remote-tracking branch 'public/ticket9969' 11 lat temu
..
common 4a6b43bf76 fix some warnings in compat_threads.c 11 lat temu
config d8517fe843 Merge remote-tracking branch 'origin/maint-0.2.5' 11 lat temu
ext f54e54b0b4 Bump copyright dates to 2015, in case someday this matters. 11 lat temu
or 5d4bb6f61f Merge remote-tracking branch 'public/ticket9969' 11 lat temu
test 5d4bb6f61f Merge remote-tracking branch 'public/ticket9969' 11 lat temu
tools f54e54b0b4 Bump copyright dates to 2015, in case someday this matters. 11 lat temu
trunnel 9fd6fbec28 Regenerate pwbox.c with the latest trunnel 11 lat temu
win32 563bb1ad81 Bump version to 0.2.6.2-alpha-dev 11 lat temu
include.am 3b7d0ed08e Use trunnel for crypto_pwbox encoding/decoding. 11 lat temu