diff options
author | David Goulet <dgoulet@torproject.org> | 2017-04-25 13:44:06 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-05-09 10:30:52 -0400 |
commit | d52a1e2faaf0edf8f5899c6fa9864d0cecebf692 (patch) | |
tree | e72f5f89e9017f1c62acc9890c645450db306536 /src/or/router.c | |
parent | fea72571dfc70ec766edaaea2dc80c1e759a977d (diff) | |
download | tor-d52a1e2faaf0edf8f5899c6fa9864d0cecebf692.tar.gz tor-d52a1e2faaf0edf8f5899c6fa9864d0cecebf692.zip |
config: Remove AllowSingleHopExits option
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans
up the code associated with it.
Partially fixes #22060
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/router.c')
-rw-r--r-- | src/or/router.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/router.c b/src/or/router.c index 7fb49e8eba..ca86c33bd6 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -2932,7 +2932,7 @@ router_dump_router_to_string(routerinfo_t *router, "onion-key\n%s" "signing-key\n%s" "%s%s" - "%s%s%s%s", + "%s%s%s", router->nickname, address, router->or_port, @@ -2955,8 +2955,7 @@ router_dump_router_to_string(routerinfo_t *router, ntor_cc_line ? ntor_cc_line : "", family_line, we_are_hibernating() ? "hibernating 1\n" : "", - "hidden-service-dir\n", - options->AllowSingleHopExits ? "allow-single-hop-exits\n" : ""); + "hidden-service-dir\n"); if (options->ContactInfo && strlen(options->ContactInfo)) { const char *ci = options->ContactInfo; |