summaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-02-28 11:17:30 -0500
committerNick Mathewson <nickm@torproject.org>2017-02-28 11:17:30 -0500
commit242f9b3ffb6c100de5b9eb2cbccecbf07c68554f (patch)
tree20b3a2146d0d09e480523b1361e11c433089bbc7 /src/or/circuitbuild.c
parent9ec08f98995a87baf6c0367a036661286f58e295 (diff)
parentd004b9222e6f07f01666aa2de852fc19e9096a08 (diff)
downloadtor-242f9b3ffb6c100de5b9eb2cbccecbf07c68554f.tar.gz
tor-242f9b3ffb6c100de5b9eb2cbccecbf07c68554f.zip
Merge remote-tracking branch 'public/bug21407'
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 79962e8dbb..14e829b03e 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -819,7 +819,7 @@ should_use_create_fast_for_circuit(origin_circuit_t *circ)
}
if (options->FastFirstHopPK == -1) {
/* option is "auto", so look at the consensus. */
- return networkstatus_get_param(NULL, "usecreatefast", 1, 0, 1);
+ return networkstatus_get_param(NULL, "usecreatefast", 0, 0, 1);
}
return options->FastFirstHopPK;