Merge branch 'bug6690_022' into maint-0.2.2
commit1c30e6abc93fa086a14d01d838066581a3657285
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Aug 2012 20:03:48 +0000 (27 16:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Aug 2012 20:03:48 +0000 (27 16:03 -0400)
tree8cdad342a8ce81ded6a606a28585b343520689e5
parentd48cebc5e498b0ae673635f40fc57cdddab45d5b
parent62d96284f7e0f81c40d5df7e53dd7b4dfe7e56a5
Merge branch 'bug6690_022' into maint-0.2.2