Merge branch 'fs_refactor'

diff --cc .gitignore
Simple merge

diff --cc Makefile.am
index c10790c52ce501fa06938c13dbd7a8791481e297,f43b2ad1f01d40933ad02f4af709f9f10eefbe70..ef727e01f5ce230f3645b2697dc81f85b45524ad
--- 1/Makefile.am
--- 2/Makefile.am
+++ b/Makefile.am
@@@ -40,8 -40,8 +40,9 @@@ endi
  # "Common" libraries used to link tor's utility code.
  TOR_UTIL_LIBS = \
        src/common/libor.a \
+         src/lib/libtor-fs.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 \
@@@ -58,8 -58,8 +59,9 @@@
  # and tests)
  TOR_UTIL_TESTING_LIBS = \
        src/common/libor-testing.a \
+         src/lib/libtor-fs-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 configure.ac
Simple merge

diff --cc src/include.am
Simple merge

diff --cc src/lib/log/torlog.c
Simple merge