Nick Mathewson 8855b2a90c Merge remote-tracking branch 'origin/maint-0.2.2' ...

Conflicts:
	src/common/tortls.c

Conflict on comment near use of the new OPENSSL_V macro

2012-02-10 10:56:37 -05:00

..

common

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

2012-02-10 10:56:37 -05:00

config

Merge branch 'maint-0.2.2'

2012-02-09 04:21:20 -05:00

or

Fix fencepost error with HearbeatPeriod option

2012-02-08 04:44:15 -05:00

test

Use the standard _WIN32, not the Torism MS_WINDOWS or deprecated WIN32

2012-01-31 15:48:47 -05:00

tools

Use the standard _WIN32, not the Torism MS_WINDOWS or deprecated WIN32

2012-01-31 15:48:47 -05:00

win32

Use the standard _WIN32, not the Torism MS_WINDOWS or deprecated WIN32

2012-01-31 15:48:47 -05:00

Makefile.am

…