diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-09-09 09:56:59 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-09-09 09:56:59 -0400 |
| commit | fa89eb60e952b964147bddd8d40e503e6872a291 (patch) | |
| tree | 0911ad37ee8a4394334cfcb4ffc539ffcfa68cdf | |
| parent | 2f8c0584bf3fa960f2cd1f63f57e5e908699cd1f (diff) | |
| parent | f6c446db47cb7dd08b1098312bf05f1442b8bb19 (diff) | |
| download | tor-fa89eb60e952b964147bddd8d40e503e6872a291.tar.gz tor-fa89eb60e952b964147bddd8d40e503e6872a291.zip | |
Merge remote-tracking branch 'yawning/feature15482_fixup'
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index 190e4d4daa..98d9d83846 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6247,6 +6247,9 @@ parse_port_config(smartlist_t *out, } else if (!strcasecmp(elt, "PreferSOCKSNoAuth")) { prefer_no_auth = ! no; continue; + } else if (!strcasecmp(elt, "KeepAliveIsolateSOCKSAuth")) { + socks_iso_keep_alive = ! no; + continue; } if (!strcasecmpend(elt, "s")) @@ -6262,8 +6265,6 @@ parse_port_config(smartlist_t *out, isoflag = ISO_CLIENTPROTO; } else if (!strcasecmp(elt, "IsolateClientAddr")) { isoflag = ISO_CLIENTADDR; - } else if (!strcasecmp(elt, "KeepAliveIsolateSOCKSAuth")) { - socks_iso_keep_alive = ! no; } else { log_warn(LD_CONFIG, "Unrecognized %sPort option '%s'", portname, escaped(elt_orig)); |