[tor-commits] [tor/master] Merge branch 'feature3946_squashed'

commit 79bb44c219af8f88573fb33954e5d2e16ef8fe42 Merge: 1810db9 8869899 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jan 16 14:50:22 2012 -0500 Merge branch 'feature3946_squashed' changes/fast_bw_param | 8 ++++++++ src/or/control.c | 1 - src/or/dirserv.c | 12 ++++++++++++ 3 files changed, 20 insertions(+), 1 deletions(-)