[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0

[nickm at torproject.org]

commit 2d849716df357b570eaf4557638f63a9b2d8a6c1
Merge: 50fbede45 53c3174ee
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 18 11:02:08 2017 -0500

    Merge branch 'maint-0.2.9' into maint-0.3.0

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