commit 63e39b291e97438460814e6428f102aeb8528324 Merge: 28ec2d9 e5fc02c Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 13 09:56:14 2017 -0400

Merge remote-tracking branch 'dgoulet/bug21155_031_02'

changes/bug21155 | 5 +++++ src/or/config.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+)