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

[nickm at torproject.org]

commit 5c98411663c8545a197f4962134a2dfd092e21b1
Merge: fe5d607d6 89b9951ec
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 13 11:15:50 2017 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug8185_025 |  6 ++++++
 src/or/relay.c      | 11 +++++++++++
 2 files changed, 17 insertions(+)