Merge remote branch 'mikeperry/bug1952-merge' into maint-0.2.2
commit1cbdbff9618ffa568cbdfc5d2751fd78ec6beced
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 16:17:41 +0000 (27 12:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Sep 2010 16:17:41 +0000 (27 12:17 -0400)
tree5e9d5f6fb07b74c80279effaacd69bf6dbfa7d43
parentc8e1538a0bdcb83dc2aeec075dcffdcac5bf45b7
parentdfe8c2146ccdf659ce5616e8b7f8449c5970de49
Merge remote branch 'mikeperry/bug1952-merge' into maint-0.2.2