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

Nick Mathewson 4a93ed1ede Merge branch 'maint-0.2.9'		%!s(int64=9) %!d(string=hai) anos
..
.dummy	df76da0f3b Add a .dummy file in the changes directory to stop git from removing it	%!s(int64=10) %!d(string=hai) anos
trove-2017-001	767516680c TROVE-2017-001 : move -ftrapv back into --expensive-hardening.	%!s(int64=9) %!d(string=hai) anos