]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'bug1772' into maint-0.2.2
authorRoger Dingledine <arma@torproject.org>
Thu, 30 Sep 2010 03:52:18 +0000 (23:52 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 30 Sep 2010 03:52:18 +0000 (23:52 -0400)
commit3cbe463e964d71b401e11b29dc356bf6ef855f7f
tree861c423a9555f39dcc14e661eed27bf36d1a9a44
parent48cd096276590e40540bc255b2610931351b14cb
parentf2aa8f08cb6a5a258eadf05ca157ec43b975706a
Merge branch 'bug1772' into maint-0.2.2
src/or/circuitbuild.c
src/or/circuitbuild.h
src/or/circuituse.c
src/or/or.h