Nick Mathewson 92cba63459 Merge remote-tracking branch 'origin/maint-0.2.2' %!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 24731ce6a7 Update to the May 2012 GeoIP database. %!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