Roger Dingledine 5ddb9b3134 Merge branch 'maint-0.2.2' into maint-0.2.3

2012-07-06 16:31:40 -04:00

..

geoip

Revert to the May 2012 geoip db

2012-07-06 16:29:51 -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.sample.in

update the torrc.sample timestamp, and clarify socksport 0

2012-04-23 03:10:40 -04:00