]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'public/no_dup_guards' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Mon, 18 Mar 2013 18:50:01 +0000 (14:50 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 18 Mar 2013 18:50:01 +0000 (14:50 -0400)
commit26639b7798b5f5dae93e40bd7d050cb218a8aad2
tree4e267e2dee87d5e3ffe6c1f4c94dd882961269e3
parent173efa10515e23b45e37f96a3755a2f16411a71a
parent44095312fa63c2623418346eb0cb487b45cf9c50
Merge remote-tracking branch 'public/no_dup_guards' into maint-0.2.4
src/or/circuitbuild.c
src/or/entrynodes.c
src/or/or.h
src/or/routerlist.c