Merge remote-tracking branch 'jigsaw/fix-15381'
commitff65618f16a1ae01b0d8267fa658b214581af524
authorNick Mathewson <nickm@torproject.org>
Tue, 23 Aug 2016 13:55:37 +0000 (23 09:55 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 23 Aug 2016 13:55:37 +0000 (23 09:55 -0400)
tree39834f37dc62d1f47a1b5567b54003b0cc2a39a2
parente8d7953c611200835d4011b12e210e878f0d13fd
parent3d6ae798cf502d5b4ee08811a57b6c69c5de31eb
Merge remote-tracking branch 'jigsaw/fix-15381'