Merge remote-tracking branch 'jigsaw/fix-19562'
commit3e8f93bb103d3537703c168a82450aeab5f96710
authorNick Mathewson <nickm@torproject.org>
Fri, 19 Aug 2016 23:41:53 +0000 (19 19:41 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 19 Aug 2016 23:41:53 +0000 (19 19:41 -0400)
treeb6652855c3418f26b80fd65ea0eb8eef5804a548
parentfdc2a9195686805e98e221150fa476afe2d394e9
parent8c0fdf6a276077123c356f3fc9d29eebfc41db72
Merge remote-tracking branch 'jigsaw/fix-19562'