Roger Dingledine 0b74f64275 Merge branch 'maint-0.2.1' into release-0.2.1		2012-01-05 06:38:15 -05:00
..
common	Don't send a certificate chain on outgoing TLS connections from non-relays	2011-10-26 23:20:56 +02:00
config	Update to the January 2012 GeoIP database.	2012-01-05 11:10:57 +01:00
or	Bug 4786 fix: don't convert EARLY to RELAY on v1 connections	2011-12-28 15:54:06 -05:00
tools	Remove the -F option from tor-resolve.	2011-10-26 17:13:04 -04:00
win32	Bump the version to 0.2.1.32	2011-12-15 12:01:07 -05:00
Makefile.am	Link tools directory into rest of build system	2004-10-28 20:31:15 +00:00