[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1529'

[nickm@xxxxxxxxxxxxxx]

commit 5086b16055777f11b3d196d637b91a134adf4baf
Merge: 7f03ba06d 4ae77e15d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jan 17 08:49:56 2020 -0500

    Merge remote-tracking branch 'tor-github/pr/1529'

 changes/bug32315             |  4 ++++
 src/core/proto/proto_socks.c |  6 +++---
 src/test/test_socks.c        | 37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 3 deletions(-)




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