sengler/tor-parallel-relay-conn @ 186df044cdf896131af5fba1f2e4da7a468e79ab

Roger Dingledine aac22f1523 revert r13221 (for now)		18 lat temu
..
Makefile.am	aac22f1523 revert r13221 (for now)	18 lat temu
torrc.complete.in	832ef9562f r14623@tombo: nickm \| 2007-11-01 22:25:18 -0400	19 lat temu
torrc.sample.in	621c50d645 add a 'bridge relay' config section to the sample torrc	19 lat temu