Nick Mathewson 69b4138c00 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2		2010-10-04 12:32:35 -04:00
..
geoip	Update to the October 1 2010 Maxmind GeoLite Country database.	2010-10-04 11:45:53 +02:00
Makefile.am	Do not ship a fallback-consensus until the related bugs are fixed.	2008-05-29 00:54:08 +00:00
torrc.bridge.in	Don't put a ControlPort without auth in sample bridge torrc	2010-06-10 17:44:36 +02:00
torrc.complete.in	Correct default for RendPostPeriod in docs	2010-09-21 01:05:47 -04:00
torrc.sample.in	change Bytes to B to fix ticket 1195.	2010-06-10 11:36:33 -04:00