diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-10-22 10:14:03 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-10-22 10:14:03 -0400 |
| commit | 8e4daa7bb0941037b6b5585059e5570267ee6eb9 (patch) | |
| tree | 6e25f987b8db6c6f5e43aef8251e49adb34ae7b7 /src/tools/tor-resolve.c | |
| parent | 71613993e0f9c015d33f1405187a5c5828987ea2 (diff) | |
| parent | 93dfb1203715bd275d0eed6c8cccf6b6db76fd95 (diff) | |
| download | tor-8e4daa7bb0941037b6b5585059e5570267ee6eb9.tar.gz tor-8e4daa7bb0941037b6b5585059e5570267ee6eb9.zip | |
Merge remote-tracking branch 'public/ticket6938'
Conflicts:
src/tools/tor-resolve.c
Diffstat (limited to 'src/tools/tor-resolve.c')
| -rw-r--r-- | src/tools/tor-resolve.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 480c7e52ca..74af511acb 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -344,7 +344,7 @@ 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]; |