merge 3.5

This commit is contained in:
Benjamin Peterson 2016-09-06 15:54:38 -07:00
commit 0cf223873e
2 changed files with 17 additions and 1 deletions

View file

@ -3718,6 +3718,8 @@ int main()
break;
}
}
freeaddrinfo(aitop);
aitop = NULL;
}
if (!(inet4 == 0 || inet4 == 2))