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

[nickm at torproject.org]

commit d3a972561aeb38d7b346be1826054c60bf3adfaa
Merge: 502d2c006 d1e4ffc71
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 16 12:11:45 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/bug26072 | 5 +++++
 src/or/relay.c   | 1 +
 2 files changed, 6 insertions(+)