sengler/tor-parallel-relay-conn @ a2517fa77c066e34d58fd50f930529b84e30946e

Nick Mathewson a2517fa77c Merge remote-tracking branch 'origin/maint-0.2.2'		15 lat temu
..
bug4331	f6b1dc2805 Fix typo, spotted by tmpname0901. Thanks!	15 lat temu