Merge commit 'mikeperry/bug1739' into maint-0.2.2
commit48cd096276590e40540bc255b2610931351b14cb
authorRoger Dingledine <arma@torproject.org>
Wed, 29 Sep 2010 21:17:59 +0000 (29 17:17 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 29 Sep 2010 21:17:59 +0000 (29 17:17 -0400)
tree31653a7ee4bdc1ec46328afe73e7738f7eee0302
parent474e4d2722d52cf225a88cb7b7c677273b8f50ac
parent4caf39f1c8db6acc25f84df024073d43c04c8645
Merge commit 'mikeperry/bug1739' into maint-0.2.2
src/or/circuituse.c
src/or/or.h