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

[nickm at torproject.org]

commit 53abbc784e5ff377a4f64f47b9a9404228055719
Merge: 3c8a7cb54 74c059596
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 5 09:59:40 2019 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

 changes/bug30942    |  4 ++++
 src/core/or/relay.c | 11 +++++++++++
 2 files changed, 15 insertions(+)