Merge remote-tracking branch 'asn/bug19872_v2'
commita3d419634bef0bbac4118d08272d59c9fe66a1bb
authorNick Mathewson <nickm@torproject.org>
Tue, 23 Aug 2016 12:50:32 +0000 (23 08:50 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 23 Aug 2016 12:50:32 +0000 (23 08:50 -0400)
tree4f5dcec8a4f6b8bff495f36db345ba80204cd264
parentb3f43a22ab921ce6e256dd8f4e1cbedf2d280392
parentb8bfdf638e9448ecda9dda1a2c02d7bbf4778341
Merge remote-tracking branch 'asn/bug19872_v2'