Nick Mathewson ddfb398494 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 ...

Conflicts:
	src/config/geoip

2010-12-14 14:13:24 -05:00

..

geoip

Update to the December 1 2010 Maxmind GeoLite Country database.

2010-12-08 17:59:40 +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

change Bytes to B to fix ticket 1195.

2010-06-10 11:36:33 -04:00