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

[nickm at torproject.org]

commit 420e8737b4910e7cddb6c3efe42ecd9424aa9dd1
Merge: 15179a3e0 666653758
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 13 11:15:50 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

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