commit 8accf71c4418990296dbc01ffa4020da10448a7d
Merge: 2b2b97484 009205dab
Author: Nick Mathewson <ni...@torproject.org>
Date: Sat Dec 1 20:35:38 2018 -0500
Merge remote-tracking branch 'tor-github/pr/556'
changes/ticket27620 | 3 +
src/tools/include.am | 7 +-
src/tools/tor-resolve.c | 396 +++++++++++++++++++++++++++++++++------------
src/trunnel/socks5.c | 13 +-
src/trunnel/socks5.trunnel | 2 +-
5 files changed, 313 insertions(+), 108 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
