Roger Dingledine 5ddb9b3134 Merge branch 'maint-0.2.2' into maint-0.2.3 %!s(int64=12) %!d(string=hai) anos
..
Makefile.am 4ead083dbc Do not ship a fallback-consensus until the related bugs are fixed. %!s(int64=16) %!d(string=hai) anos
geoip 4e7552e552 Revert to the May 2012 geoip db %!s(int64=12) %!d(string=hai) anos
torrc.sample.in 770433f194 update the torrc.sample timestamp, and clarify socksport 0 %!s(int64=12) %!d(string=hai) anos