From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 15 Dec 2009 18:23:27 +0000 (-0500)
Subject: Merge commit 'sebastian/ewma2' into ewma
X-Git-Tag: tor-0.2.2.7-alpha~42^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=296381eda0efd1c849834b49547a8bb7fe773e71;p=thirdparty%2Ftor.git

Merge commit 'sebastian/ewma2' into ewma

Conflicts:
	src/or/relay.c
---

296381eda0efd1c849834b49547a8bb7fe773e71