aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-11-20 11:51:36 -0500
committerNick Mathewson <nickm@torproject.org>2014-11-20 11:51:36 -0500
commitf15cd22bb7c8f4f7009417e50a827c5bcc656807 (patch)
treeea259a5cede3016ed167c9bf66595bd44af8ca69 /src/or/config.c
parent126f220071b2313147240b585df6893d21943021 (diff)
downloadtor-f15cd22bb7c8f4f7009417e50a827c5bcc656807.tar.gz
tor-f15cd22bb7c8f4f7009417e50a827c5bcc656807.zip
Don't build introduction circuits until we know we can build circuits
Patch from akwizgran. Ticket 13447.
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index dc2fc13b9a..5b62c565b9 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1071,6 +1071,8 @@ options_act_reversible(const or_options_t *old_options, char **msg)
"non-control network connections. Shutting down all existing "
"connections.");
connection_mark_all_noncontrol_connections();
+ /* We can't complete circuits until the network is re-enabled. */
+ can_complete_circuit = 0;
}
}