commit 3bfe5dae048a66da629c37e707a1d21fe46d3984 Merge: 8bd3c1b e1337b4 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 27 11:26:23 2017 -0500

Merge remote-tracking branch 'dgoulet/ticket21269_030_01'

changes/feature21269 | 3 +++ src/or/config.c | 3 ++- src/test/test_config.c | 9 ++++++++- 3 files changed, 13 insertions(+), 2 deletions(-)