aboutsummaryrefslogtreecommitdiff
path: root/src/lib/net
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-01-09 09:38:22 -0500
committerNick Mathewson <nickm@torproject.org>2019-01-09 09:38:22 -0500
commit694e3c57fd1af2cdaa4650d69c50f4108a8612f6 (patch)
tree74dab41d4e02087a23c97253c0898b58fa60d69e /src/lib/net
parent380ae2b74b8c8762acc075d8d22bc5d6320655e1 (diff)
parentc59b572e934ec501cf7db78d10e36a6cf984b97b (diff)
downloadtor-694e3c57fd1af2cdaa4650d69c50f4108a8612f6.tar.gz
tor-694e3c57fd1af2cdaa4650d69c50f4108a8612f6.zip
Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5
Diffstat (limited to 'src/lib/net')
-rw-r--r--src/lib/net/socketpair.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/net/socketpair.c b/src/lib/net/socketpair.c
index 380338f15c..6a21581d87 100644
--- a/src/lib/net/socketpair.c
+++ b/src/lib/net/socketpair.c
@@ -62,7 +62,7 @@ get_local_listener(int family, int type)
len = sizeof(sin);
} else {
sa = (struct sockaddr *) &sin6;
- sin6.sin6_family = AF_INET;
+ sin6.sin6_family = AF_INET6;
sin6.sin6_addr.s6_addr[15] = 1;
len = sizeof(sin6);
}