commit 75b4975d7722d9497847fdab8dcfb2ac10f58fdb Merge: 2658e70 09ed8a5 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Apr 14 17:59:01 2014 -0400 Merge branch 'bug11464_023_squashed' into maint-0.2.3 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(+)