commit e2cd600da6e99c38193a6bd326b4208b1fc380d8 Merge: ded2c8c 27058bd Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 13 16:22:40 2017 -0400 Merge remote-tracking branch 'public/bug21682_030' into maint-0.3.0 changes/bug21682 | 3 +++ src/or/confparse.c | 1 + 2 files changed, 4 insertions(+)