diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-04-11 01:42:54 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-04-11 01:42:54 -0400 |
| commit | ee3cc44f27b6620ad25a20bb16fcffe23ca66663 (patch) | |
| tree | 4123415471a14f6cdfbb34992bccec4cd5297276 /src/or/control.c | |
| parent | 7f50af116f2497a73fe9113e814a5765047cf3ca (diff) | |
| parent | 805ecb8719e5e66d708f040027fecc6de56b3a5b (diff) | |
| download | tor-ee3cc44f27b6620ad25a20bb16fcffe23ca66663.tar.gz tor-ee3cc44f27b6620ad25a20bb16fcffe23ca66663.zip | |
Merge remote-tracking branch 'public/bug7302' into maint-0.2.4
Conflicts:
src/or/status.c
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/control.c b/src/or/control.c index f50b87711c..390b8d1502 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4715,6 +4715,9 @@ control_event_bootstrap_problem(const char *warn, int reason) !any_pending_bridge_descriptor_fetches()) recommendation = "warn"; + if (we_are_hibernating()) + recommendation = "ignore"; + while (status>=0 && bootstrap_status_to_string(status, &tag, &summary) < 0) status--; /* find a recognized status string based on current progress */ status = bootstrap_percent; /* set status back to the actual number */ |