[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9

[nickm at torproject.org]

commit 1db5081ba1e9201673dac296957a6d8b0a694855
Merge: c958fda6e 8cc147aa8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 09:06:34 2017 -0400

    Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/ticket23910 | 3 +++
 src/or/config.c     | 3 +++
 2 files changed, 6 insertions(+)