commit 8a9d86bf05110426e05c5dde4b22e45dfa99f8e9 Merge: 03a4e97 69df16e Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 20 01:08:12 2015 -0500

Merge remote-tracking branch 'public/bug11454_11457'

changes/bug11454 | 6 ++++ changes/bug11457 | 5 ++++ src/common/container.h | 11 ++++++++ src/or/routerlist.c | 73 ++++++++++++++++++++++++++++++------------------ 4 files changed, 68 insertions(+), 27 deletions(-)