aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/or/networkstatus.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 805042155..e8434aba0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -67,6 +67,11 @@ Changes in version 0.2.0.10-alpha - 2007-11-0?
the Tor process. Patch from Marco Bonetti with tweaks from Mike
Perry.
+ o Major bugfixes:
+ - Consider replace the current consensus when certificates arrive
+ that make the pending consensus valid. Previously, we were only
+ considering replacement when the new certs _didn't_ help.
+
o Minor bugfixes:
- Refuse to start if both ORPort and UseBridges are set. Bugfix
on 0.2.0.x.
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index cacb1307c..2bb653e3e 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -1384,7 +1384,7 @@ networkstatus_note_certs_arrived(void)
{
if (consensus_waiting_for_certs) {
if (networkstatus_check_consensus_signature(
- consensus_waiting_for_certs, 0)<0) {
+ consensus_waiting_for_certs, 0)>=0) {
if (!networkstatus_set_current_consensus(
consensus_waiting_for_certs_body, 0, 1)) {
tor_free(consensus_waiting_for_certs_body);