Merge branch 'ticket28880'
commit7232f04939f44146254c21086178c62cce1d3392
authorNick Mathewson <nickm@torproject.org>
Fri, 4 Jan 2019 02:33:40 +0000 (3 21:33 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 4 Jan 2019 02:33:40 +0000 (3 21:33 -0500)
tree88e2401851ad05c64ed38f319337c0e398a32473
parenta7cbbf279ef8ab727ff3603940575c6d948985dc
parentce3d501040fb994bb3c7dd82b21e02648621d3f1
Merge branch 'ticket28880'