sengler/tor-parallel-relay-conn @ 8c643b51bfa18a82d6424a7b8917f7fbe96feb6e

Nick Mathewson f570470830 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2		%!s(int64=14) %!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	c75ee94ab4 Update to the August 2011 GeoIP database.	%!s(int64=14) %!d(string=hai) anos
torrc.bridge.in	f9a4b3e45b Don't put a ControlPort without auth in sample bridge torrc	%!s(int64=15) %!d(string=hai) anos
torrc.sample.in	280dc1f9c7 change Bytes to B to fix ticket 1195.	%!s(int64=15) %!d(string=hai) anos