Merge commit 'mikeperry/bandwidth-proposals-final'
commitecccdd6a8bd04d9df387dd0b13fca80e712fbcbb
authorNick Mathewson <nickm@torproject.org>
Sun, 9 Aug 2009 20:10:06 +0000 (9 13:10 -0700)
committerNick Mathewson <nickm@torproject.org>
Sun, 9 Aug 2009 20:10:06 +0000 (9 13:10 -0700)
treeae3be91cd93114a9664a2f5c494ecff9e0d00cf6
parentfd290e6650e8c44a695ac21009d02ab44f98b647
parent8c5004da72bfeeb83c633c1bb31fb91e548005ff
Merge commit 'mikeperry/bandwidth-proposals-final'