aboutsummaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-29 13:02:50 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-29 13:02:50 -0400
commit2e607ff51931b35ee531fa60b83487b3f4f944a7 (patch)
tree005f66b245b8afadf2106dff94491610bfb81473 /src/tools
parenta0be2f1350bf4974a9655421c3b30ba87a7b2279 (diff)
parente1a25f0c3602e007872277ef9ab437cc97cfd47b (diff)
downloadtor-2e607ff51931b35ee531fa60b83487b3f4f944a7.tar.gz
tor-2e607ff51931b35ee531fa60b83487b3f4f944a7.zip
Merge remote-tracking branch 'origin/maint-0.2.5'
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/tor-resolve.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c
index 306f6c66ab..480c7e52ca 100644
--- a/src/tools/tor-resolve.c
+++ b/src/tools/tor-resolve.c
@@ -8,6 +8,7 @@
#include "../common/util.h"
#include "address.h"
#include "../common/torlog.h"
+#include "sandbox.h"
#include <stdio.h>
#include <stdlib.h>
@@ -344,6 +345,7 @@ main(int argc, char **argv)
log_severity_list_t *s = tor_malloc_zero(sizeof(log_severity_list_t));
init_logging();
+ sandbox_disable_getaddrinfo_cache();
arg = &argv[1];
n_args = argc-1;