Merge branch 'bug27709_029' into maint-0.2.9
commitb113399658934f3a4526387a63429ec4377ca8be
authorNick Mathewson <nickm@torproject.org>
Mon, 15 Oct 2018 14:34:39 +0000 (15 10:34 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 15 Oct 2018 14:34:39 +0000 (15 10:34 -0400)
treee7d99041851a615fa60e52e8d153b453a9237aef
parent717507e3bb38d11814f4128ed7ccde676ab2aa89
parent5e582c7ffafd9075373131e5e55b69507f54206e
Merge branch 'bug27709_029' into maint-0.2.9