Roger Dingledine 5ddb9b3134 Merge branch 'maint-0.2.2' into maint-0.2.3 12 anni fa
..
Makefile.am 4ead083dbc Do not ship a fallback-consensus until the related bugs are fixed. 16 anni fa
geoip 4e7552e552 Revert to the May 2012 geoip db 12 anni fa
torrc.sample.in 770433f194 update the torrc.sample timestamp, and clarify socksport 0 12 anni fa