Nick Mathewson eb7f4d0059 Merge remote-tracking branch 'yawning/bug16052a_027'

2015-05-21 10:48:52 -04:00

..

common

19:38 < Yawning> nickm: you left the "+#ifndef SSL_clear_mode" block in ;_;

2015-05-20 15:40:42 -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 'origin/maint-0.2.6'

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

or

Merge remote-tracking branch 'yawning/bug16052a_027'

2015-05-21 10:48:52 -04:00

test

Merge branch 'bug16034_no_more_openssl_098_squashed'

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

tools

Merge branch 'bug16034_no_more_openssl_098_squashed'

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

trunnel

Disable assertions during coverage builds

2015-03-21 02:34:44 +01:00

win32

Bump version to 0.2.7.1-alpha-dev

2015-05-12 11:54:06 -04:00

include.am

…