[tor-commits] [tor/master] Merge branch 'tor-github/pr/1344'

[dgoulet@xxxxxxxxxxxxxx]

commit 014abf86e5a6484d23f72bb6959d78e379d90206
Merge: 40be20d54 37c616aea
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Wed Oct 2 10:37:49 2019 -0400

    Merge branch 'tor-github/pr/1344'

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

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits