Merge remote-tracking branch 'public/ticket6938'

Conflicts:
	src/tools/tor-resolve.c

diff --cc src/or/config.c
Simple merge

diff --cc src/or/main.c
Simple merge

diff --cc src/test/bench.c
Simple merge

diff --cc src/test/test.c
Simple merge

diff --cc src/tools/tor-resolve.c
index 480c7e52ca080a5f95422dca2680ae712f5f6e06,1b1e6745cb057fe6dcb3f7b28fbca331b947a5e2..74af511acb5f09f6763660bbe4d1b0ef56c2e6a7
--- 1/src/tools/tor-resolve.c
--- 2/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;