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

[nickm at torproject.org]

commit 28673a600e09d52f941de80fabd1b4221d2f0f11
Merge: b5873fa77 d388f9d87
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 18 11:03:16 2017 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug18329-minimal | 6 ++++++
 src/or/router.c          | 9 +++++++++
 2 files changed, 15 insertions(+)