[tor-commits] [tor/master] Merge remote-tracking branch 'public/ticket6938'

[nickm at torproject.org]

commit 8e4daa7bb0941037b6b5585059e5570267ee6eb9
Merge: 7161399 93dfb12
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 22 10:14:03 2014 -0400

    Merge remote-tracking branch 'public/ticket6938'
    
    Conflicts:
    	src/tools/tor-resolve.c

 changes/ticket6938       |    4 +
 src/common/log.c         |  253 +++++++++++++++++++++++++++++++++-------------
 src/common/torlog.h      |    3 +-
 src/or/config.c          |    6 +-
 src/or/main.c            |    2 +-
 src/test/bench.c         |    2 +-
 src/test/test.c          |    2 +-
 src/test/test_bt_cl.c    |    2 +-
 src/test/test_logging.c  |    4 +-
 src/tools/tor-checkkey.c |    2 +-
 src/tools/tor-gencert.c  |    2 +-
 src/tools/tor-resolve.c  |    2 +-
 12 files changed, 205 insertions(+), 79 deletions(-)

diff --cc src/tools/tor-resolve.c
index 480c7e5,1b1e674..74af511
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@@ -344,8 -343,7 +344,8 @@@ main(int argc, char **argv
    char *result_hostname = NULL;
    log_severity_list_t *s = tor_malloc_zero(sizeof(log_severity_list_t));
  
-   init_logging();
+   init_logging(1);
 +  sandbox_disable_getaddrinfo_cache();
  
    arg = &argv[1];
    n_args = argc-1;