Nick Mathewson 8b686d98c4 Merge maint-0.2.2 for the bug1090-part1-squashed branch ... Resolved conflicts in: doc/tor.1.txt src/or/circuitbuild.c src/or/circuituse.c src/or/connection_edge.c src/or/connection_edge.h src/or/directory.c src/or/rendclient.c src/or/routerlist.c src/or/routerlist.h These were mostly releated to the routerinfo_t->node_t conversion.		2011-04-27 14:36:30 -04:00
..
common	Merge remote-tracking branch 'origin/maint-0.2.2'	2011-04-19 12:41:01 -04:00
config	Merge branch 'maint-0.2.1' into maint-0.2.2	2011-04-04 03:53:38 -04:00
or	Merge maint-0.2.2 for the bug1090-part1-squashed branch	2011-04-27 14:36:30 -04:00
test	Merge remote-tracking branch 'origin/maint-0.2.2'	2011-04-19 12:41:01 -04:00
tools	Bump copyright statements to 2011 (master)	2011-01-03 11:55:01 -05:00
win32	bump to 0.2.2.19-alpha	2010-11-21 18:00:12 -05:00
Makefile.am	Move testing code into new src/test directory.	2009-09-23 00:24:43 -04:00