Merge branch 'bug1899'
commit60e3def3ed7428b139cfd6e36517f930a84bd085
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Sep 2010 02:19:25 +0000 (14 22:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Sep 2010 02:19:25 +0000 (14 22:19 -0400)
tree9ebca5d98cc88cb8efebf448598797ca5364b863
parente2b71d884139af902fc9b9222f5b55fe5a7a91ec
parentf5b7e039f39d881fc8f48c2e6004e605ca0e24c1
Merge branch 'bug1899'
src/or/dirserv.c
src/or/routerlist.c
src/or/routerlist.h