commit 860c4fc81166568f2909708c455ca6a70d81a2f8 Merge: 6c64681 82c5e38 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 3 11:46:03 2012 -0400

Merge remote-tracking branch 'origin/maint-0.2.3'

src/or/routerlist.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)