Roger Dingledine ef0bc7f8f2 Merge branch 'maint-0.2.2' 14 éve
..
Makefile.am 4ead083dbc Do not ship a fallback-consensus until the related bugs are fixed. 18 éve
geoip 4180624a7d Update to the February 2012 GeoIP database. 14 éve
torrc.bridge.in f9a4b3e45b Don't put a ControlPort without auth in sample bridge torrc 16 éve
torrc.sample.in 6c3cffe450 revert the revert in master, since I didn't want to revert it there 14 éve