Merge remote branch 'origin/maint-0.2.2'

Resolved trivial one-line conflicts.

Conflicts:
	src/or/dirserv.c
	src/or/rephist.c
This commit is contained in:
Nick Mathewson
2011-03-08 16:10:40 -05:00
6 changed files with 90 additions and 24 deletions
+13
View File
@@ -0,0 +1,13 @@
o Minor features (authorities)
- Take altered router IP addresses and ORPorts into account when
determining router stability. Previously, if a router changed
its IP or ORPort, the authorities would not treat it as having
any downtime for the purposes of stability calculation, whereas
clients would experience downtime since the change could take a
while to propagate to them. Resolves issue 1035.
o Minor bugfixes (authorities)
- Try to be more robust to hops back in time when calculating
router stability. Previously, if a run of uptime or downtime
appeared to be negative, the calculation could give incorrect
results. Bugfix on 0.2.0.6-alpha.