Nick Mathewson 628b735fe3 Merge remote-tracking branch 'rransom-tor/bug3460-v4' ...

Conflicts:
	src/or/rendservice.c

2011-11-29 20:56:39 -05:00

..

common

Merge branch 'bug4587_v2'

2011-11-29 19:15:40 -05:00

config

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

2011-11-14 11:10:27 -05:00

or

Merge remote-tracking branch 'rransom-tor/bug3460-v4'

2011-11-29 20:56:39 -05:00

test

Make unit tests run again. Fix bug 4606.

2011-11-29 20:37:57 -05:00

tools

tor-gencert: Fix a minor formatting issue in an error message (re: #4574)

2011-11-25 10:04:41 -05:00

win32

bump to 0.2.3.8-alpha-dev

2011-11-23 04:41:19 -05:00

Makefile.am

Move testing code into new src/test directory.

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