]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge commit 'mikeperry/bandwidth-proposals-final'
authorNick Mathewson <nickm@torproject.org>
Sun, 9 Aug 2009 20:10:06 +0000 (13:10 -0700)
committerNick Mathewson <nickm@torproject.org>
Sun, 9 Aug 2009 20:10:06 +0000 (13:10 -0700)

Trivial merge