Merge commit 'mikeperry/bug1772' into maint-0.2.2
commitd17fcad3ae183d9a9bc9a0e3d1c159b6d8c261b8
authorRoger Dingledine <arma@torproject.org>
Thu, 30 Sep 2010 04:00:06 +0000 (30 00:00 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 30 Sep 2010 04:00:06 +0000 (30 00:00 -0400)
treec031fb0c36577ca838def9b517c434b1892c3c63
parent3cbe463e964d71b401e11b29dc356bf6ef855f7f
parent7eedd0f6bc6843a5fdd755dc68183296a2ad54bc
Merge commit 'mikeperry/bug1772' into maint-0.2.2
src/or/or.h