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

[dgoulet@xxxxxxxxxxxxxx]

commit 21d0d81d825fc2a63125afd9707e9f698fd39d07
Merge: 6166af507 35721b38e
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Wed Jan 22 14:32:30 2020 -0500

    Merge branch 'tor-github/pr/1677'

 changes/bug33005                | 3 +++
 src/feature/client/transports.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)

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