commit 112c554fcfc15a31198d38a46f6c4f7b8e901401 Merge: 8adecae 09c5465 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 24 14:36:23 2015 -0400 Merge branch 'bug14018' changes/bug14018 | 4 ++++ src/or/config.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 64 insertions(+), 4 deletions(-)