Nick Mathewson f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 ...

Conflicts:
	src/common/test.h
	src/or/test.c

2011-01-03 11:51:17 -05:00

..

Makefile.am

Add --enable-static-zlib option

2010-04-14 19:28:21 +02:00

tor-checkkey.c

Rename log.h to torlog.h

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

tor-gencert.c

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

2011-01-03 11:51:17 -05:00

tor-resolve.c

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

2011-01-03 11:51:17 -05:00