commit e35ca135282c6b833f51543988580bd860b49be6 Merge: 06efbbb 0a9c17a Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 18 21:33:53 2013 -0400

Merge remote-tracking branch 'public/bug8716_023' into maint-0.2.4

changes/bug8716 | 3 +++ src/or/config.c | 3 ++- src/or/control.c | 2 +- src/or/control.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-)