sengler/tor-parallel-relay-conn @ c8e09dd0d2bab75cee4f0683eb61636bbebb50d4

Nick Mathewson df8e2bbc0f Merge remote-tracking branch 'tor-github/pr/1038'		%!s(int64=6) %!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
bug29034	c525135dac Bug 29034: Cleanup hs circuitmap when purpose changes.	%!s(int64=6) %!d(string=hai) anos
doc30630	5d4b4f948a Mention Travis/Appveyor/Jenkins URLs in ReleasingTor.md	%!s(int64=6) %!d(string=hai) anos
ticket30550	fb91e1c6ef Remove torctl.in from contrib/dist	%!s(int64=6) %!d(string=hai) anos