aboutsummaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2017-04-25 13:58:35 -0400
committerNick Mathewson <nickm@torproject.org>2017-05-09 10:30:52 -0400
commitbc34654ba2df0e4f4834095ab404f5429c518be9 (patch)
treec80ca69fa87825c8bd2ac16740134a00e3750fef /src/or/circuitbuild.c
parent09bc858dd54101e645b31bf32fe463b73c38add2 (diff)
downloadtor-bc34654ba2df0e4f4834095ab404f5429c518be9.tar.gz
tor-bc34654ba2df0e4f4834095ab404f5429c518be9.zip
config: Remove FastFirstHopPK 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/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 012229bf86..0af962e645 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -816,12 +816,7 @@ should_use_create_fast_for_circuit(origin_circuit_t *circ)
* creating on behalf of others. */
return 0;
}
- if (options->FastFirstHopPK == -1) {
- /* option is "auto", so look at the consensus. */
- return networkstatus_get_param(NULL, "usecreatefast", 0, 0, 1);
- }
-
- return options->FastFirstHopPK;
+ return networkstatus_get_param(NULL, "usecreatefast", 0, 0, 1);
}
/** Return true if <b>circ</b> is the type of circuit we want to count