Merge branch 'bug5070_take2'
commit120d524fba10fb3bea7caa762e3324e95bc9e529
authorNick Mathewson <nickm@torproject.org>
Mon, 7 May 2012 15:03:33 +0000 (7 11:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 May 2012 15:03:33 +0000 (7 11:03 -0400)
tree9c272b76f88883037f8dace556702fbd3250bed8
parentc648f9751f5639073ba70860dde6a8091bc6a6b8
parenteefdb9eec25463df012a27cdc28b6f7b73831d29
Merge branch 'bug5070_take2'