[tor-commits] [bridgedb/develop] Merge branch 'fix/18949' into develop

[isis@xxxxxxxxxxxxxx]

commit 6164c627a2653a81bcfa4197288b23a504f979e9
Merge: 0bb6014 2f3c79c
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Mon May 30 16:06:46 2016 +0000

    Merge branch 'fix/18949' into develop

 .travis.yml           |  12 +--
 requirements.txt      |   2 +-
 test/https_helpers.py | 228 +++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 233 insertions(+), 9 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits