sengler/tor-parallel-relay-conn @ add00045aa56c77b93b1fb4b3cf424588a7baf0e

Nick Mathewson add00045aa Merge branch 'bug26101_26102'		%!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=10) %!d(string=hai) anos
bug26101_26102	db94d7fed2 Update cov-diff to handle new gcov, and remove timestamps	%!s(int64=7) %!d(string=hai) anos