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

[nickm at torproject.org]

commit 5926f14ecfacbcfb8c63cbd942918a496a26e27c
Merge: 7b93939c7 2d849716d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 18 11:03:16 2017 -0500

    Merge branch 'maint-0.3.0' into release-0.3.0

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