Merge pull request #14152 from dianlujitao/master
authorRosen Penev <rosenp@gmail.com>
Mon, 7 Dec 2020 06:39:37 +0000 (22:39 -0800)
committerGitHub <noreply@github.com>
Mon, 7 Dec 2020 06:39:37 +0000 (22:39 -0800)
miniupnpd: Don't override ipv6_listening_ip


Trivial merge