commit bf71866da006820a2345d8257f208d8147707daf Merge: 4319f99 e8b09c0 Author: Nick Mathewson nickm@torproject.org Date: Mon Sep 10 15:37:13 2012 -0400

Merge branch 'remove_old_ver_checks'

changes/remove_old_ver_checks | 4 +++ src/or/circuitbuild.c | 5 +-- src/or/directory.c | 47 ++++++++-------------------------------- src/or/directory.h | 3 +- src/or/dirserv.c | 5 +--- src/or/networkstatus.c | 8 +------ src/or/or.h | 11 +-------- src/or/router.c | 3 +- src/or/routerlist.c | 14 +----------- src/or/routerparse.c | 11 --------- 10 files changed, 22 insertions(+), 89 deletions(-)