[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit 6247f5a5ba6d300cd64a2639296c3514dcb70066
Merge: 133e1e870 72832086e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 11 11:51:06 2017 -0400

    Merge branch 'maint-0.3.1'

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