[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

commit 64523609c91d9207191bf8c59ef684a239dd4f31 Merge: 34b9bc2 c8b8550 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Feb 10 12:03:46 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug5067 | 5 +++++ src/or/routerlist.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)