Merge branch 'bug2972' into maint-0.2.2
commitede102fd4675af8ac4060767f0348f3c93617e80
authorNick Mathewson <nickm@torproject.org>
Mon, 16 May 2011 00:20:36 +0000 (15 20:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 16 May 2011 00:20:36 +0000 (15 20:20 -0400)
tree29f2e5a044c793c55dbcb834822ac9075a23c530
parent2b9c5ee301f705cbf69c725ca749d4ac752c06d3
parentf72e792be5437c9ee11d3f498ed3bb469b46d1bb
Merge branch 'bug2972' into maint-0.2.2