Merge bug5595-v2-squashed into maint-0.2.4
commitaaa3a085db05c4d98b7c51b5ef16da166e7c7f0a
authorAndrea Shepard <andrea@torproject.org>
Sat, 11 May 2013 02:39:48 +0000 (10 19:39 -0700)
committerAndrea Shepard <andrea@torproject.org>
Sat, 11 May 2013 02:39:48 +0000 (10 19:39 -0700)
treeb5b7a62362aac37bcbf237548de19f467d88805b
parentbae5dd6c8d4535360d471932b87431f54b515567
parent54f41d68e9e30ccd0ebd84a3f8e913ea9e923cfd
Merge bug5595-v2-squashed into maint-0.2.4
src/or/Makefile.nmake
src/or/directory.c
src/or/dirvote.c
src/or/include.am
src/or/router.c
src/or/routerlist.c
src/or/routerlist.h
src/test/test_containers.c