Merge branch 'bug24582'
commita3d1c38ea6e62dfd01771c39124b703807f22393
authorNick Mathewson <nickm@torproject.org>
Fri, 12 Jan 2018 00:57:57 +0000 (11 19:57 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 12 Jan 2018 00:57:57 +0000 (11 19:57 -0500)
tree85ea309afbac916a0fd60a22874ada1a00ac0120
parent42751e2123f6dcc87f3992d38c1889f7da981a7b
parente18840f619c274cdca476e741ba3edecefbcc3f7
Merge branch 'bug24582'