]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'remove_old_ver_checks'
authorNick Mathewson <nickm@torproject.org>
Mon, 10 Sep 2012 19:37:13 +0000 (15:37 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 10 Sep 2012 19:37:13 +0000 (15:37 -0400)
1  2 
src/or/dirserv.c
src/or/or.h
src/or/routerlist.c

Simple merge
diff --cc src/or/or.h
Simple merge
Simple merge