commit af83a205b077590b4a44e6ee758f63745e0e9e47 Merge: d48df89 6c8a186 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Apr 23 09:34:00 2015 -0400 Merge remote-tracking branch 'andrea/ticket14840' changes/ticket14840 | 5 +++ src/or/config.c | 108 ++++++++++++++++++++++++++++++++------------------- 2 files changed, 74 insertions(+), 39 deletions(-)