Fix merge conflicts in network-stream-tests.el

diff --cc configure.ac
Simple merge

diff --cc lisp/net/gnutls.el
Simple merge

diff --cc lisp/net/network-stream.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/eval.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc test/lisp/net/network-stream-tests.el
index a5e146f02c85af17131b340e1f40c0424775e80c,e19bd528961e6c4cb06de4432f458e24f48113ac..c6a20b09690eb0fdb26f86707f77e94566fa7a33
--- 1/test/lisp/net/network-stream-tests.el
--- 2/test/lisp/net/network-stream-tests.el
+++ b/test/lisp/net/network-stream-tests.el
@@@ -204,8 -230,7 +237,8 @@@
  (ert-deftest connect-to-tls-ipv6-nowait ()
    (skip-unless (executable-find "gnutls-serv"))
    (skip-unless (gnutls-available-p))
-   (let ((server (make-tls-server))
 +  (skip-unless (not (eq system-type 'windows-nt)))
+   (let ((server (make-tls-server 44333))
          (times 0)
          proc status)
      (sleep-for 1)