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

[nickm at torproject.org]

commit 7c59c751b05ff1195538d2d4bd8cb4ff8ea1885e
Merge: 5bee5fbac 5a21b2708
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 31 11:43:14 2017 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug23693 | 6 ++++++
 src/or/config.c  | 1 +
 2 files changed, 7 insertions(+)