commit 4d5e8378be3848c07a9b1026924e879e5642903f Merge: 47e7a167d 72832086e Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 11 11:51:06 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

changes/bug23155 | 4 ++++ src/common/confline.c | 16 +++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-)