From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 22 Oct 2014 14:14:03 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/ticket6938'
X-Git-Tag: tor-0.2.6.1-alpha~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e4daa7bb0941037b6b5585059e5570267ee6eb9;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/ticket6938'

Conflicts:
	src/tools/tor-resolve.c
---

8e4daa7bb0941037b6b5585059e5570267ee6eb9
diff --cc src/tools/tor-resolve.c
index 480c7e52ca,1b1e6745cb..74af511acb
--- 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;