commit bc4c966851c16cfe3c92375fba22baf45a111a67 Merge: 0820031 1499315 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Apr 14 18:00:54 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug11464_023 | 5 +++++ src/or/networkstatus.c | 11 +++++++++++ src/or/routerlist.c | 33 +++++++++++++++++++++++++++++++++ src/or/routerlist.h | 1 + src/or/routerparse.c | 8 ++++++++ 5 files changed, 58 insertions(+)