Merge remote-tracking branch 'jigsaw/fix-17758'
commita0398dd3486b5e489b8e6db7490b9c24337161b0
authorNick Mathewson <nickm@torproject.org>
Tue, 23 Aug 2016 13:57:14 +0000 (23 09:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 23 Aug 2016 13:57:14 +0000 (23 09:57 -0400)
treecd62ccaa6c7d3e73fcfc05a18fe24ff488230a51
parentff65618f16a1ae01b0d8267fa658b214581af524
parent4f19f85eda9fa096fcca2b8ce34b1db0b757d4a7
Merge remote-tracking branch 'jigsaw/fix-17758'