Roger Dingledine a70ff4b2cb Merge branch 'maint-0.2.1' into maint-0.2.2		2012-02-09 04:21:08 -05:00
..
geoip	Update to the February 2012 GeoIP database.	2012-02-09 09:16:24 +01: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.sample.in	Revert "add a "docs" to the manual URI as listed in torrc.sample.in"	2012-02-09 03:57:04 -05:00