commit b9a0ad5ac3e3c21abd1b2c366799e5cbce4cb4c5 Merge: ac80d7d 2afaa43 Author: Isis Lovecruft <isis@torproject.org> Date: Sun Jul 26 12:05:27 2015 +0000 Merge branch 'hotfix/0.3.3-error-pages' 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(-)