Roger Dingledine 9d2b3849b2 Merge branch 'maint-0.2.1' into maint-0.2.2		2011-04-04 03:53:38 -04:00
..
geoip	switch to the apr 2011 geoip db	2011-04-04 03:52:58 -04: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	change Bytes to B to fix ticket 1195.	2010-06-10 11:36:33 -04:00