Nick Mathewson a509dbba50 Merge commit 'karsten/dirbytes2' ...

Conflicts:
	src/or/rephist.h

2010-08-18 10:06:14 -04:00

..

bug1141

Scale CONSENSUS_MIN_SECONDS_BEFORE_CACHING by voting interval

2010-08-17 11:55:39 -04:00

bugfoundin1790

Correctly report written bytes on linked connections.

2010-08-18 13:54:41 +02:00

enhancement1790

Count bytes we spend on answering directory requests.

2010-08-18 13:54:41 +02:00

headercleanup

Remove unused function declarations

2010-08-17 23:49:39 +02:00