]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'linus/bug6757'
authorNick Mathewson <nickm@torproject.org>
Thu, 4 Oct 2012 14:31:25 +0000 (10:31 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 4 Oct 2012 14:31:25 +0000 (10:31 -0400)
1  2 
src/or/circuitbuild.c
src/or/nodelist.c

Simple merge
Simple merge