sengler/tor-parallel-relay-conn @ 78d4200abe4ede44f18ed749b069056a0795922f

Nick Mathewson 83135d75a3 Merge branch 'maint-0.3.0'		%!s(int64=8) %!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-004	eb5d05f696 Another changes fix.	%!s(int64=8) %!d(string=hai) anos
trove-2017-005	56a7c5bc15 TROVE-2017-005: Fix assertion failure in connection_edge_process_relay_cell	%!s(int64=8) %!d(string=hai) anos