Merge branch 'bug7947' into maint-0.2.4
commitdbdc99483df6f0fdba9f7af8954719d47990a8b8
authorNick Mathewson <nickm@torproject.org>
Mon, 18 Mar 2013 19:56:55 +0000 (18 15:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 18 Mar 2013 19:56:55 +0000 (18 15:56 -0400)
treebe5f777cbe2e172201756ed907442cfe6bed70f2
parentaa4fcc4f13ecc0959f26ac4c86a8e9b59d9c8783
parentbd9901bef245b3880c9a60034b9fdf6d4829eb65
Merge branch 'bug7947' into maint-0.2.4