commit 6d6e21a239deca137eb117eef49d3f875646a5fe Merge: 58e813d 905443f Author: Nick Mathewson <nickm@torproject.org> Date: Thu Sep 18 15:31:08 2014 -0400 Merge branch 'bug4244b_squashed' changes/bug4244 | 6 ++++++ src/or/config.c | 14 +++++++------- src/or/or.h | 5 ++++- 3 files changed, 17 insertions(+), 8 deletions(-)