diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-04-09 08:29:21 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-04-09 08:29:21 -0400 |
| commit | fa6b80d6e510dd7027cc2dab50622bad4dc90064 (patch) | |
| tree | e7e67789cb39400a11f9318472d1c8ed9aa72436 /src/or/control.c | |
| parent | aacbf551c459e3bccbd7dec53fcefbceaab98a33 (diff) | |
| parent | b0bbe6b2f1d8f0f2c83565f94d8a7dc5c5f72a91 (diff) | |
| download | tor-fa6b80d6e510dd7027cc2dab50622bad4dc90064.tar.gz tor-fa6b80d6e510dd7027cc2dab50622bad4dc90064.zip | |
Merge remote-tracking branch 'public/bug10431'
Diffstat (limited to 'src/or/control.c')
| -rwxr-xr-x | src/or/control.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c index 7f421a71d5..c91705257d 100755 --- a/src/or/control.c +++ b/src/or/control.c @@ -4887,7 +4887,7 @@ control_event_bootstrap(bootstrap_status_t status, int progress) */ MOCK_IMPL(void, control_event_bootstrap_problem, (const char *warn, int reason, - const or_connection_t *or_conn)) + or_connection_t *or_conn)) { int status = bootstrap_percent; const char *tag, *summary; @@ -4898,6 +4898,11 @@ MOCK_IMPL(void, /* bootstrap_percent must not be in "undefined" state here. */ tor_assert(status >= 0); + if (or_conn->have_noted_bootstrap_problem) + return; + + or_conn->have_noted_bootstrap_problem = 1; + if (bootstrap_percent == 100) return; /* already bootstrapped; nothing to be done here. */ |