[tor-commits] [tor/master] Merge branch 'maint-0.4.1'

[nickm at torproject.org]

commit 54ad92a240d8fe0997bf833272f041ee42de5ffb
Merge: e57209dc3 74c059596
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 5 09:59:40 2019 -0400

    Merge branch 'maint-0.4.1'

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