sengler/tor-parallel-relay-conn @ a509dbba504f7b5e2c1d93bad25e500493b06fb5

Nick Mathewson a509dbba50 Merge commit 'karsten/dirbytes2'		%!s(int64=15) %!d(string=hai) anos
..
bug1141	6f58481335 Scale CONSENSUS_MIN_SECONDS_BEFORE_CACHING by voting interval	%!s(int64=15) %!d(string=hai) anos
bugfoundin1790	58b6195455 Correctly report written bytes on linked connections.	%!s(int64=15) %!d(string=hai) anos
enhancement1790	db94b7f46e Count bytes we spend on answering directory requests.	%!s(int64=15) %!d(string=hai) anos
headercleanup	d5c83f2014 Remove unused function declarations	%!s(int64=15) %!d(string=hai) anos