sengler/tor-parallel-relay-conn @ 4c06a804d946de238e2d6a0b1a7dd655b0d82ccc

Roger Dingledine 4c06a804d9 Merge branch 'maint-0.2.3'		13 éve
..
bug7190	2ecee3fce2 Let 0.2.3 clients exit to internal addresses if they want	13 éve
bug7192	85659d3964 Fix parse_short_policy (bug 7192.)	13 éve
split_circuitbuild	907db008ab Move the circuit build timeout code into its own file.	13 éve