commit d4a64fdc02e7aa6dc30dcb3cf15f3d6cf9e74f20 Merge: 5a73df0 dc9dd23 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 28 10:48:06 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' changes/bug5238 | 4 ++++ src/or/routerlist.c | 15 ++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-)