commit 17a1ae025ac65d68bcfff2971fa6153daed7e220 Merge: c48068ece ee015d36f Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 7 08:59:31 2020 -0500

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

src/lib/net/inaddr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)