Merge branch 'bug5285_v2'
commit8b62a738b3add64dcd26a82dff44a7e9e11ff5a9
authorNick Mathewson <nickm@torproject.org>
Wed, 16 Jan 2013 22:02:46 +0000 (16 17:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 16 Jan 2013 22:02:46 +0000 (16 17:02 -0500)
tree6ea9ea35dd6980c2ec5aecf5aa483d3fa0c6e4af
parente4821fa14de6d76219d4e5c1a320ba263bd5e46d
parentca18768fb2d178052fbf1207075406673f422c8a
Merge branch 'bug5285_v2'