Nick Mathewson 69b4138c00 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 %!s(int64=16) %!d(string=hai) anos
..
Makefile.am 4ead083dbc Do not ship a fallback-consensus until the related bugs are fixed. %!s(int64=18) %!d(string=hai) anos
geoip bad609ae6b Update to the October 1 2010 Maxmind GeoLite Country database. %!s(int64=16) %!d(string=hai) anos
torrc.bridge.in f9a4b3e45b Don't put a ControlPort without auth in sample bridge torrc %!s(int64=16) %!d(string=hai) anos
torrc.complete.in fb34c66e83 Correct default for RendPostPeriod in docs %!s(int64=16) %!d(string=hai) anos
torrc.sample.in 280dc1f9c7 change Bytes to B to fix ticket 1195. %!s(int64=16) %!d(string=hai) anos