Merge branch 'ticket28881_035' into maint-0.3.5
commit702fd6f0f21138c0864cdf0ce73c0319aceeccb7
authorNick Mathewson <nickm@torproject.org>
Tue, 18 Dec 2018 18:52:36 +0000 (18 13:52 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 18 Dec 2018 18:52:36 +0000 (18 13:52 -0500)
tree70046a372fabd9376960c6dbd666e513056d5281
parentbf71dce01a9977786a6ba1e99fe8827c08df57e5
parent4894d44ab8beee587c99a1765236813d445b392e
Merge branch 'ticket28881_035' into maint-0.3.5