From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 9 Aug 2009 20:10:06 +0000 (-0700)
Subject: Merge commit 'mikeperry/bandwidth-proposals-final'
X-Git-Tag: tor-0.2.2.1-alpha~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6423091f071dc7c843d0fd02ac32b880b7754b24;p=thirdparty%2Ftor.git

Merge commit 'mikeperry/bandwidth-proposals-final'
---

6423091f071dc7c843d0fd02ac32b880b7754b24