Merge remote-tracking branch 'public/ticket28838_035' into maint-0.3.5
commit98736cf36a1d8250e53a0c86a0b80fdb75f0d551
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Jan 2019 14:44:10 +0000 (3 09:44 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Jan 2019 14:44:10 +0000 (3 09:44 -0500)
tree7ee43e7e7bec0e13b16ecb1f9499b6fcca0d1514
parented62f0fa151f7a21a9634fbec1e95832ddbede94
parent041e9235c1710936a43f73d2f6e87bfc6e1c2242
Merge remote-tracking branch 'public/ticket28838_035' into maint-0.3.5