From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 19 Dec 2009 03:33:02 +0000 (-0500)
Subject: Merge branch 'ewma'
X-Git-Tag: tor-0.2.2.7-alpha~42
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=05a2473b7f38d6c5cab0c98aec7ab61aec3ac6cc;p=thirdparty%2Ftor.git

Merge branch 'ewma'
---

05a2473b7f38d6c5cab0c98aec7ab61aec3ac6cc