[tor-commits] [tor/master] Merge branch 'sandbox_refactor'

[nickm at torproject.org]

commit 21136037182f55b5aef3730853e65fa2c7ebd722
Merge: b9b05e437 05040a9e8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 27 14:45:14 2018 -0400

    Merge branch 'sandbox_refactor'

 .gitignore                                     |  2 ++
 Makefile.am                                    |  2 ++
 src/common/compat.c                            |  2 +-
 src/common/include.am                          |  3 ---
 src/common/storagedir.c                        |  2 +-
 src/common/util.c                              |  2 +-
 src/include.am                                 |  1 +
 src/lib/crypt_ops/.may_include                 |  1 +
 src/lib/crypt_ops/crypto.c                     |  1 -
 src/lib/crypt_ops/crypto_rand.c                |  2 +-
 src/lib/sandbox/.may_include                   | 15 +++++++++++++++
 src/lib/sandbox/include.am                     | 18 ++++++++++++++++++
 src/{common => lib/sandbox}/linux_syscalls.inc |  0
 src/{common => lib/sandbox}/sandbox.c          | 12 +++++++-----
 src/{common => lib/sandbox}/sandbox.h          |  0
 src/or/config.c                                |  2 +-
 src/or/connection.c                            |  2 +-
 src/or/dns.c                                   |  2 +-
 src/or/main.c                                  |  2 +-
 src/or/routerlist.c                            |  2 +-
 src/or/routerparse.c                           |  2 +-
 src/or/statefile.c                             |  2 +-
 src/rust/build.rs                              |  1 +
 src/test/test_options.c                        |  2 +-
 src/tools/tor-resolve.c                        |  2 +-
 25 files changed, 60 insertions(+), 22 deletions(-)

diff --cc .gitignore
index 390859f5e,3c4c91e04..13c5a6788
--- a/.gitignore
+++ b/.gitignore
@@@ -185,10 -185,10 +185,12 @@@ uptime-*.jso
  /src/lib/libtor-malloc-testing.a
  /src/lib/libtor-net.a
  /src/lib/libtor-net-testing.a
+ /src/lib/libtor-sandbox.a
+ /src/lib/libtor-sandbox-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 c151d441c,97057048d..c10790c52
--- 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-sandbox.a \
 +	src/lib/libtor-container.a \
  	src/lib/libtor-net.a \
          src/lib/libtor-log.a \
          src/lib/libtor-lock.a \
@@@ -57,7 -57,7 +58,8 @@@
  # and tests)
  TOR_UTIL_TESTING_LIBS = \
  	src/common/libor-testing.a \
+         src/lib/libtor-sandbox-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 \
diff --cc src/include.am
index b6ef3cf16,5d28ea34e..54b6505e5
--- a/src/include.am
+++ b/src/include.am
@@@ -13,8 -13,8 +13,9 @@@ include src/lib/lock/include.a
  include src/lib/log/include.am
  include src/lib/malloc/include.am
  include src/lib/net/include.am
+ include src/lib/sandbox/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