Merge branch 'bug1805' into maint-0.2.2
commit24a45f54d270d86dde456cbb45640811d1ba26c2
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 16:25:32 +0000 (27 12:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 16:25:32 +0000 (27 12:25 -0400)
tree13aafe468db1feccc7834c92b84a672a04b21d76
parent1cbdbff9618ffa568cbdfc5d2751fd78ec6beced
parent9c8fb75edf3e8025a71b806d35e550f89f3f0999
Merge branch 'bug1805' into maint-0.2.2
src/or/routerlist.c