commit 05fbbfe472657ca93bd473056e662850e01af6f1 Merge: d366c33 05f7336 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 1 14:02:02 2015 -0400

Merge remote-tracking branch 'public/remove_old_version_checks'

changes/remove_old_version_checks | 5 +++ src/or/entrynodes.c | 69 +++---------------------------------- src/or/or.h | 3 -- src/or/routerlist.c | 3 -- src/or/routerparse.c | 11 ------ src/or/routerparse.h | 1 - 6 files changed, 10 insertions(+), 82 deletions(-)