commit d9cd4b7072f6292680c188ccb9fe8d2c5be4f610 Merge: 43dd9bf e2cd600 Author: Nick Mathewson nickm@torproject.org Date: Mon Mar 13 16:22:54 2017 -0400

Merge branch 'maint-0.3.0'

changes/bug21682 | 3 +++ src/or/confparse.c | 1 + 2 files changed, 4 insertions(+)