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

[nickm at torproject.org]

commit e655744c802c30d5a7150035ce8c6f1c066f1a92
Merge: c476d30e8 b588b6087
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 12:51:33 2019 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

 changes/ticket31466           | 5 +++++
 src/core/or/connection_edge.c | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)