sengler/tor-parallel-relay-conn @ 765e4364d97cea17affef7413cda5fa02eb8f347

Nick Mathewson 765e4364d9 Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1		%!s(int64=7) %!d(string=hai) anos
..
.dummy	df76da0f3b Add a .dummy file in the changes directory to stop git from removing it	%!s(int64=11) %!d(string=hai) anos
bug29034	c525135dac Bug 29034: Cleanup hs circuitmap when purpose changes.	%!s(int64=7) %!d(string=hai) anos
doc30630	5d4b4f948a Mention Travis/Appveyor/Jenkins URLs in ReleasingTor.md	%!s(int64=7) %!d(string=hai) anos