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

commit 53c3174ee43c3f54f8180be8256180f6f0d24c0d Merge: 1b9bb2c84 d388f9d87 Author: Nick Mathewson <nickm@torproject.org> Date: Sat Nov 18 11:01:43 2017 -0500 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/bug18329-minimal | 6 ++++++ src/or/router.c | 9 +++++++++ 2 files changed, 15 insertions(+)