Merge branch 'bug28413_029' into maint-0.2.9
commit7f042cbc0a9397c1e5c0f3e9c3bb31ff333d9983
authorNick Mathewson <nickm@torproject.org>
Tue, 13 Nov 2018 13:26:51 +0000 (13 08:26 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 13 Nov 2018 13:26:51 +0000 (13 08:26 -0500)
treee1e25815245dc8e2123c4cf8c71a58bc11748659
parent46796623f995c5b63d5cfbda1a038d9f6158ec90
parent1a11702a9a4d5f95c52eb55263008ce2aa8017ef
Merge branch 'bug28413_029' into maint-0.2.9