From: Nick Mathewson Date: Wed, 27 Jun 2018 16:52:31 +0000 (-0400) Subject: Merge branch 'net_refactor' X-Git-Tag: tor-0.3.5.1-alpha~353 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9b05e437d09c4d06b554d0484c7ae1a3aa1d647;p=thirdparty%2Ftor.git Merge branch 'net_refactor' --- b9b05e437d09c4d06b554d0484c7ae1a3aa1d647 diff --cc .gitignore index 34f8454423,d6f56f5259..390859f5ea --- a/.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 482189eebd,d80f81de10..c151d441cc --- a/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 9e89fc8e06,5b8aacdd59..b6ef3cf16c --- a/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