Merge branch 'net_refactor'

diff --cc .gitignore
index 34f84544230472e46d0905a14b86b0ab5b0d26f1,d6f56f5259e29d1eedd7ab3a98f1316f7c901dc3..390859f5ea7f3bf5a34d9ee82f488dd8834f44e0
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -183,10 -183,10 +183,12 @@@ uptime-*.jso
  /src/lib/libtor-log-testing.a
  /src/lib/libtor-malloc.a
  /src/lib/libtor-malloc-testing.a
+ /src/lib/libtor-net.a
+ /src/lib/libtor-net-testing.a
  /src/lib/libtor-string.a
  /src/lib/libtor-string-testing.a
 +/src/lib/libtor-smartlist-core.a
 +/src/lib/libtor-smartlist-core-testing.a
  /src/lib/libtor-tls.a
  /src/lib/libtor-tls-testing.a
  /src/lib/libtor-trace.a

diff --cc Makefile.am
index 482189eebd8c01ef2135a595d8448cd062017895,d80f81de107843c00839b6e2ff4cda84fc0ffcbc..c151d441cc843d1611f744f59fbb93f1420e0d38
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -40,7 -40,7 +40,8 @@@ endi
  # "Common" libraries used to link tor's utility code.
  TOR_UTIL_LIBS = \
        src/common/libor.a \
 +      src/lib/libtor-container.a \
+       src/lib/libtor-net.a \
          src/lib/libtor-log.a \
          src/lib/libtor-lock.a \
          src/lib/libtor-fdio.a \
@@@ -56,7 -56,7 +57,8 @@@
  # and tests)
  TOR_UTIL_TESTING_LIBS = \
        src/common/libor-testing.a \
 +      src/lib/libtor-container-testing.a \
+       src/lib/libtor-net-testing.a \
          src/lib/libtor-log-testing.a \
          src/lib/libtor-lock-testing.a \
          src/lib/libtor-fdio-testing.a \

diff --cc src/include.am
index 9e89fc8e06af076d96d57a8e878333e08de47735,5b8aacdd59f54eaa7322139b57644c7be717e5d4..b6ef3cf16c57a2199bf53482556af591b2dba376
--- 1/src/include.am
--- 2/src/include.am
+++ b/src/include.am
@@@ -12,8 -12,8 +12,9 @@@ include src/lib/intmath/include.a
  include src/lib/lock/include.am
  include src/lib/log/include.am
  include src/lib/malloc/include.am
+ include src/lib/net/include.am
  include src/lib/string/include.am
 +include src/lib/smartlist_core/include.am
  include src/lib/testsupport/include.am
  include src/lib/tls/include.am
  include src/lib/trace/include.am

diff --cc src/rust/build.rs
Simple merge

diff --cc src/test/include.am
Simple merge