commit 09a00a2f826233b417066d90dcf5ba9be48b4e13 Merge: cccd3f1 4d83999 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 31 11:09:04 2017 -0500

Merge remote-tracking branch 'public/bug21300'

changes/bug21300 | 6 ++++++ src/or/confparse.c | 22 ++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-)