commit 33989cd002c761c37d2ed551f8aae0955dde4cd4 Merge: 834e1f808 651629cbd Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 4 12:48:26 2017 -0400

Merge remote-tracking branch 'dgoulet/bug23366_032_01'

changes/bug23366 | 4 ++++ src/or/config.c | 27 +++++++++++++++++++++------ src/test/test_options.c | 2 ++ 3 files changed, 27 insertions(+), 6 deletions(-)