]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge commit 'mikeperry/bug1739' into maint-0.2.2
authorRoger Dingledine <arma@torproject.org>
Wed, 29 Sep 2010 21:17:59 +0000 (17:17 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 29 Sep 2010 21:17:59 +0000 (17:17 -0400)
1  2 
src/or/circuituse.c
src/or/or.h

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