diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-23 16:59:41 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-10-26 17:13:04 -0400 |
| commit | a166f1041444c133d0617d998cba6a1e41c8002f (patch) | |
| tree | cbc7642912e954c018baa7328c44c01e438d34c4 /src | |
| parent | a68867b150eabfa820a12f8a9f1b4cf5b9dbd8e9 (diff) | |
| download | tor-a166f1041444c133d0617d998cba6a1e41c8002f.tar.gz tor-a166f1041444c133d0617d998cba6a1e41c8002f.zip | |
Remove the -F option from tor-resolve.
It used to mean "Force": it would tell tor-resolve to ask tor to
resolve an address even if it ended with .onion. But when
AutomapHostsOnResolve was added, automatically refusing to resolve
.onion hosts stopped making sense. So in 0.2.1.16-rc (commit
298dc95dfd8), we made tor-resolve happy to resolve anything.
The -F option stayed in, though, even though it didn't do anything.
Oddly, it never got documented.
Found while fixing GCC 4.6 "set, unused variable" warnings.
Diffstat (limited to 'src')
| -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 4d9d57a31c..d467e879c4 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) { |