diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-28 01:55:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-28 01:55:34 -0400 |
| commit | 42b15a0aaa6e00c2ce0ce030abdb87e787f27fe4 (patch) | |
| tree | 2461a1a5f1660e0e4f3bc1aed52d3fc80c968f1b /src/tools | |
| parent | 6f200b61b7effe811809fe60459b0b5b58cb3dbb (diff) | |
| parent | a5232e0c4c572cdff85701f698b8b90c9443d7e4 (diff) | |
| download | tor-42b15a0aaa6e00c2ce0ce030abdb87e787f27fe4.tar.gz tor-42b15a0aaa6e00c2ce0ce030abdb87e787f27fe4.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tor-resolve.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 12349d9d12..8c4d3f6483 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -319,7 +319,7 @@ main(int argc, char **argv) { uint32_t sockshost; uint16_t socksport = 0, port_option = 0; - int isSocks4 = 0, isVerbose = 0, isReverse = 0, force = 0; + int isSocks4 = 0, isVerbose = 0, isReverse = 0; char **arg; int n_args; struct in_addr a; @@ -349,8 +349,6 @@ main(int argc, char **argv) isSocks4 = 0; else if (!strcmp("-x", arg[0])) isReverse = 1; - else if (!strcmp("-F", arg[0])) - force = 1; else if (!strcmp("-p", arg[0])) { int p; if (n_args < 2) { |