[tor-commits] [tor/master] Merge branch 'maint-0.2.4'

[andrea at torproject.org]

commit 50beb81d53e0697b3dc4d7dd04ebf6277f1bfaf1
Merge: 82ab33c aaa3a08
Author: Andrea Shepard <andrea at torproject.org>
Date:   Fri May 10 21:05:34 2013 -0700

    Merge branch 'maint-0.2.4'

 changes/bug5595            |    8 +
 src/or/Makefile.nmake      |    1 +
 src/or/directory.c         |   73 +++++--
 src/or/dirvote.c           |    2 +-
 src/or/fp_pair.c           |  308 ++++++++++++++++++++++++++
 src/or/fp_pair.h           |   45 ++++
 src/or/include.am          |    2 +
 src/or/router.c            |    3 +-
 src/or/routerlist.c        |  516 ++++++++++++++++++++++++++++++++++++--------
 src/or/routerlist.h        |   18 ++-
 src/test/test_containers.c |   84 +++++++
 11 files changed, 949 insertions(+), 111 deletions(-)