Nick Mathewson af7fab020a Merge remote branch 'origin/maint-0.2.2' ...

Conflicts:
	src/or/config.c

2010-09-27 17:52:20 -04:00

..

common

Merge branch 'bufferevent5'

2010-09-27 16:48:25 -04:00

config

Correct default for RendPostPeriod in docs

2010-09-21 01:05:47 -04:00

or

Merge remote branch 'origin/maint-0.2.2'

2010-09-27 17:52:20 -04:00

test

Merge branch 'bufferevent5'

2010-09-27 16:48:25 -04:00

tools

Rename log.h to torlog.h

2010-07-09 22:05:38 -04:00

win32

Bump the Tor version in master to 0.2.3.0-alpha-dev

2010-09-24 15:15:07 -04:00

Makefile.am

Move testing code into new src/test directory.

2009-09-23 00:24:43 -04:00