sengler/tor-parallel-relay-conn @ 2308f917f99384640c5b0d1ddc9f2a3dffc68e5a

Nick Mathewson 2308f917f9 Merge remote-tracking branch 'andrea/ticket15358_squashed_2'		%!s(int64=10) %!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
bug15881	c1ffeadff4 Add missing descriptor ID to HS_DESC control event	%!s(int64=10) %!d(string=hai) anos
bug16060	6f9e90101e Fix crash on HUP with mixed ephemeral services	%!s(int64=10) %!d(string=hai) anos
ticket15358	79f7721a7e Changes file for ticket 15358	%!s(int64=10) %!d(string=hai) anos