sengler/tor-parallel-relay-conn @ ca90aea5ebde66565fbb6fb5d0e88a970d3563a5

Roger Dingledine 5ddb9b3134 Merge branch 'maint-0.2.2' into maint-0.2.3		12 jaren geleden
..
Makefile.am	4ead083dbc Do not ship a fallback-consensus until the related bugs are fixed.	16 jaren geleden
geoip	4e7552e552 Revert to the May 2012 geoip db	12 jaren geleden
torrc.sample.in	770433f194 update the torrc.sample timestamp, and clarify socksport 0	12 jaren geleden