]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'tor-github/pr/1902/head'
authorNick Mathewson <nickm@torproject.org>
Fri, 5 Jun 2020 14:08:27 +0000 (10:08 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 5 Jun 2020 14:08:27 +0000 (10:08 -0400)
1  2 
src/app/config/resolve_addr.c
src/feature/control/control_getinfo.c
src/lib/net/address.c

Simple merge
Simple merge
Simple merge