Nick Mathewson 130a9c0ac8 Merge remote-tracking branch 'origin/maint-0.2.6'

2015-06-15 10:19:46 -04:00

..

common

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

2015-06-15 10:19:46 -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

Update trunnel code.

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

or

Add a log message to try to track down #16013

2015-06-11 09:55:47 -04:00

test

Remove undefined directive-in-macro in test_util_writepid

2015-06-03 04:19:05 +10: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