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

[nickm at torproject.org]

commit 666653758db631200ce389a19d0899e28f8f1dd7
Merge: c928fb988 d256d4c0a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 13 11:15:47 2017 -0500

    Merge branch 'bug8185_025' into maint-0.2.9

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