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

[asn@xxxxxxxxxxxxxx]

commit 5303dbe6249ed4b1e268f7a5c41ed6a638c4d0e3
Merge: 85473f9aa 0fa3dc322
Author: George Kadianakis <desnacked@xxxxxxxxxx>
Date:   Thu Jul 4 17:14:06 2019 +0300

    Merge branch 'tor-github/pr/1152'

 changes/ticket31026                      | 5 +++++
 scripts/maint/practracker/exceptions.txt | 4 ++--
 src/core/or/connection_edge.c            | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

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