commit 12f2d986f327de281cb70377a7cf926b0f40f4e4 Merge: b1cb9eb 2e9cd4b Author: Nick Mathewson <nickm@torproject.org> Date: Mon Feb 4 12:34:14 2013 -0500 Merge branch 'authdir_quick_fix' src/or/nodelist.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)