]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/remove_old_version_checks'
authorNick Mathewson <nickm@torproject.org>
Wed, 1 Apr 2015 18:02:02 +0000 (14:02 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 1 Apr 2015 18:02:02 +0000 (14:02 -0400)
1  2 
src/or/or.h

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