Nick Mathewson 3149bfc254 Merge branch 'bug16288_027_03_squashed'

2015-06-25 11:30:52 -04:00

..

common

Merge branch 'bug16288_027_03_squashed'

2015-06-25 11:30:52 -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

Add the openssh 6.8p1 readpassphrase implementation

2015-06-17 10:41:22 -04:00

or

Merge branch 'bug16288_027_03_squashed'

2015-06-25 11:30:52 -04:00

test

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

2015-06-25 10:41:15 -04:00

tools

Merge branch 'bug16034_no_more_openssl_098_squashed'

2015-05-20 15:33:22 -04:00

trunnel

Update trunnel code.

2015-05-28 12:44:52 -04:00

win32

Bump version to 0.2.6.9

2015-06-10 15:02:04 +00:00

include.am

Use trunnel for crypto_pwbox encoding/decoding.

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