commit e9172e51fb13cfe5d4c70a98809a45e05b528482 Merge: 676f710 2ba52f4 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 17 12:37:49 2012 -0400

Merge remote-tracking branch 'public/bug6244_part_c' into maint-0.2.3

changes/bug6244_part_c | 6 ++++ src/or/config.c | 61 ++++++++++++++++++++++++++++++----------------- src/or/config.h | 6 ++++ src/or/control.c | 15 +++++++++-- 4 files changed, 63 insertions(+), 25 deletions(-)