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

[nickm at torproject.org]

commit 2d4983dcd7e574cdf0c663e262ff83f7a99fb7ef
Merge: 15a7e24dc 8cc147aa8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 09:06:34 2017 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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