]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'rl1987/bug13644'
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Nov 2014 18:12:14 +0000 (13:12 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Nov 2014 18:12:14 +0000 (13:12 -0500)
1  2 
src/or/or.h
src/or/routerlist.c

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