Nick Mathewson 614d9bc967 Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

2015-05-13 11:05:33 -04:00

..

common

Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5

2015-03-12 12:27:25 -04:00

config

Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

2015-04-27 14:18:16 -04:00

ext

Merge remote-tracking branch 'public/bug15436_025' into maint-0.2.6

2015-03-23 09:25:15 -04:00

or

Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6

2015-05-13 11:05:33 -04:00

test

Merge remote-tracking branch 'public/feature15212_026' into maint-0.2.6

2015-03-12 13:15:08 -04:00

tools

Tweak tor-resolve docs and logs

2015-01-28 10:11:08 -05:00

trunnel

Regenerate pwbox.c with the latest trunnel

2014-09-26 09:33:24 -04:00

win32

bump version to 0.2.6.7-dev

2015-04-06 10:02:59 -04:00

include.am

Use trunnel for crypto_pwbox encoding/decoding.

2014-09-25 11:58:14 -04:00