sengler/tor-parallel-relay-conn @ 0cfdd88adb6fcd6f75d0e571ed2cc9ae3e559ded

Nick Mathewson 4080ac9eee Merge branch 'bug3825b-v8-squashed'		%!s(int64=14) %!d(string=hai) anos
..
bug3825b	dae000735e Adjust n_intro_points_wanted when a service's intro points are closed	%!s(int64=14) %!d(string=hai) anos
bug4733	597e428df6 And a changes file for bug#4733	%!s(int64=14) %!d(string=hai) anos
clang_30_options	bcca541da9 Build with warnings and clang 3.0	%!s(int64=14) %!d(string=hai) anos
portability_01_haiku	9cabedd3eb Explain why we are making gcc 3.3 work	%!s(int64=14) %!d(string=hai) anos