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

[nickm at torproject.org]

commit 73585595245ac9551a1982575941e954bb870ad0
Merge: 1d5e693b6 2d849716d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 18 11:02:42 2017 -0500

    Merge branch 'maint-0.3.0' into maint-0.3.1

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