Roger Dingledine 83e3975c8b Merge branch 'maint-0.2.1' into maint-0.2.2

2011-06-05 11:13:50 -04:00

..

geoip

move to the june 1 2011 maxmind geoip db

2011-06-05 11:12:28 -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