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

[isis@xxxxxxxxxxxxxx]

commit 2cc30af922744e6ae6db3c34535747499478ecaa
Merge: e059d91 b9a0ad5
Author: Isis Lovecruft <isis@xxxxxxxxxxxxxx>
Date:   Sun Jul 26 12:06:06 2015 +0000

    Merge branch 'master' into develop

 bridgedb/https/server.py                           |  104 ++++--
 bridgedb/https/templates/assets/css/error.css      |  208 +++++++++++
 .../templates/assets/images/404-excavator.svg      |  260 ++++++++++++++
 .../templates/assets/images/404-hills-left.svg     |   20 ++
 .../templates/assets/images/404-hills-right.svg    |   34 ++
 .../assets/images/500-hills-left-shade.svg         |    8 +
 .../templates/assets/images/500-hills-left.svg     |   22 ++
 .../assets/images/500-hills-right-shade.svg        |    8 +
 .../templates/assets/images/500-hills-right.svg    |   41 +++
 .../https/templates/assets/images/500-road.svg     |   97 ++++++
 .../assets/images/maintenance-hills-left-shade.svg |    7 +
 .../assets/images/maintenance-hills-left.svg       |   43 +++
 .../images/maintenance-hills-right-shade.svg       |    9 +
 .../assets/images/maintenance-hills-right.svg      |   21 ++
 .../assets/images/maintenance-tractor.svg          |  367 ++++++++++++++++++++
 bridgedb/https/templates/base.html                 |    1 +
 bridgedb/https/templates/error-404.html            |   39 +++
 bridgedb/https/templates/error-500.html            |   36 ++
 bridgedb/https/templates/error-503.html            |   37 ++
 setup.py                                           |    3 +-
 test/test_https.py                                 |    9 +
 test/test_https_server.py                          |   93 ++++-
 22 files changed, 1434 insertions(+), 33 deletions(-)



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