subject:"\[tor\-commits\] \[bridgedb\/master\] Merge branch 'master' into develop"

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

2020-04-01 Thread phw

commit ef9ea5c12791679cce40bdf84aa01438785da0aa
Merge: c3a820d 9a7ae57
Author: Philipp Winter 
Date:   Wed Feb 19 10:09:43 2020 -0800

Merge branch 'master' into develop

 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)



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

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

2020-02-19 Thread phw

commit 7b142b899766dea9c503fa3bdf999421ee4b7f37
Merge: eb12be5 0f2349d
Author: Philipp Winter 
Date:   Tue Feb 18 16:15:44 2020 -0800

Merge branch 'master' into develop

 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)



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

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

2020-02-18 Thread phw

commit 7f1638e1db2a36507f80b6d923baf1f62a7c4491
Merge: 74d1ec7 ae0c4eb
Author: Philipp Winter 
Date:   Tue Feb 4 11:28:50 2020 -0800

Merge branch 'master' into develop

 .test.requirements.txt   |  6 +++---
 .travis.requirements.txt | 20 ++--
 CHANGELOG|  2 +-
 requirements.txt | 16 
 4 files changed, 22 insertions(+), 22 deletions(-)



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

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

2019-09-11 Thread phw

commit d67abc72951e4448275778da58e6d445cb6cd0ef
Merge: 8291822 bbf1bdc
Author: Philipp Winter 
Date:   Tue Aug 20 09:51:44 2019 -0700

Merge branch 'master' into develop

 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



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

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

2019-08-20 Thread phw

commit db2aaadcf22edc3485deeb91fbb5931e9c53c593
Merge: 589d6f7 2d86ae0
Author: Philipp Winter 
Date:   Fri Jun 7 10:38:10 2019 -0700

Merge branch 'master' into develop

 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



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

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

2019-06-07 Thread phw

commit e6e02be5e8f1f410441c811bf80b52e518bf7c91
Merge: 1747723 a0644df
Author: Philipp Winter 
Date:   Fri Jun 7 09:35:24 2019 -0700

Merge branch 'master' into develop




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

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

2018-11-19 Thread sysrqb

commit 5ca53926d4bf32fe2cdd2ae3f2dba9e7a6f91b4e
Merge: ac7df7f 8a74291
Author: Isis Lovecruft 
Date:   Mon May 21 18:59:51 2018 +

Merge branch 'master' into develop




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

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

2018-05-21 Thread isis

commit 2ec54aa253da7969166e7f4c4253a34b8dea833d
Merge: 2a4ba64 e6ac1cc
Author: Isis Lovecruft 
Date:   Mon May 21 18:51:56 2018 +

Merge branch 'master' into develop




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

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

2018-05-21 Thread isis

commit 85e45669568d82a0c238227fe2c5d2478ff15676
Merge: d9741cf 9cfb469
Author: Isis Lovecruft 
Date:   Fri May 4 18:29:41 2018 +

Merge branch 'master' into develop




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

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

2018-05-04 Thread isis

commit c970e64636be52adfcd10db58549859ff6592313
Merge: 4faecd5 54c6629
Author: Isis Lovecruft 
Date:   Tue Feb 13 22:24:33 2018 +

Merge branch 'master' into develop




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

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

2018-02-13 Thread isis

commit 30e11ff6e5ba13f9509dfe217ff68fa46427212a
Merge: bc61afb d49e904
Author: Isis Lovecruft 
Date:   Tue Jan 23 21:42:01 2018 +

Merge branch 'master' into develop




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

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

2018-01-23 Thread isis

commit 05ca3dbd35a392e8661c7288dc42c99a3443b110
Merge: 6ace9a3 2ae288d
Author: Isis Lovecruft 
Date:   Wed Dec 20 23:07:24 2017 +

Merge branch 'master' into develop




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

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

2017-12-20 Thread isis

commit 9a926f28de7af283558bf2688d5fa642d059c678
Merge: b828d57 9bb5de6
Author: Isis Lovecruft 
Date:   Wed Dec 13 20:12:17 2017 +

Merge branch 'master' into develop

 bridgedb/distributors/moat/server.py | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)



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

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

2017-12-20 Thread isis

commit bbd40684b566faafdc87255d5358deca8a1aeb38
Merge: b4d32c7 659b4ed
Author: Isis Lovecruft 
Date:   Tue Sep 12 21:33:22 2017 +

Merge branch 'master' into develop




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

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

2017-11-15 Thread isis

commit f23f3630321e4b98db7ef47dfb596eb06ad94abb
Merge: 96707e2 513cd25
Author: Isis Lovecruft 
Date:   Sat Oct 28 00:27:59 2017 +

Merge branch 'master' into develop

 CHANGELOG | 19 +++
 1 file changed, 19 insertions(+)



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

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

2017-10-27 Thread isis

commit ab51b841590e422d81fe6138929ec52c9fe1167c
Merge: 62b17e8 a09089c
Author: Isis Lovecruft 
Date:   Mon Jan 9 19:59:05 2017 +

Merge branch 'master' into develop




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

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

2017-01-09 Thread isis

commit a333183218e4239f2d7bebeb7a3a988bc4990a6c
Merge: 78e352e 9f753b3
Author: Isis Lovecruft 
Date:   Thu Sep 22 12:08:16 2016 +

Merge branch 'master' into develop




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

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

2016-09-22 Thread isis

commit 926a9899c1a1f18649838c857291d4e6daaff746
Merge: f1267fc f2fe8fb
Author: Isis Lovecruft 
Date:   Mon Aug 8 15:23:04 2016 +

Merge branch 'master' into develop




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

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

2016-08-08 Thread isis

commit fb309152cc2db7ce49e2e104f3a8e20c54a47a8b
Merge: 936958a 908294f
Author: Isis Lovecruft 
Date:   Thu Jul 28 16:38:15 2016 +

Merge branch 'master' into develop




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

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

2016-07-28 Thread isis

commit c7d9cc4978f008fe657dd88653975248066dd1f6
Merge: 7931067 7d6defe
Author: Isis Lovecruft 
Date:   Tue Dec 1 02:45:11 2015 +

Merge branch 'master' into develop




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

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

2015-11-30 Thread isis

commit 39918ea33932b7b8f9bb561baa822893bffc4ca6
Merge: 93fbdec 93ecf69
Author: Isis Lovecruft 
Date:   Sun Jul 26 12:20:00 2015 +

Merge branch 'master' into develop




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

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

2015-07-26 Thread isis

commit e059d91887da0e35a78c38d6f093d8c359dba90d
Merge: abece06 ac80d7d
Author: Isis Lovecruft i...@torproject.org
Date:   Sat Jul 25 19:24:23 2015 +

Merge branch 'master' into develop




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

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

2015-07-26 Thread isis

commit 2cc30af922744e6ae6db3c34535747499478ecaa
Merge: e059d91 b9a0ad5
Author: Isis Lovecruft i...@torproject.org
Date:   Sun Jul 26 12:06:06 2015 +

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@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

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

2015-07-25 Thread isis

commit 2d3685220f4b473fec47480bc859bc1953cb5199
Merge: 2519454 94dd106
Author: Isis Lovecruft i...@torproject.org
Date:   Wed Apr 22 01:25:42 2015 +

Merge branch 'master' into develop




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

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

2015-05-01 Thread isis

commit 5912b3ca830b238e56d6e2a78fe359024379596d
Merge: 9ec5a96 3a1aa0d
Author: Isis Lovecruft i...@torproject.org
Date:   Wed Mar 25 19:02:12 2015 +

Merge branch 'master' into develop




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

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

2015-03-25 Thread isis

commit a06688478f76fb1bcc6e5a0f4d4aa41720bc8eb0
Merge: cdc0ffa 6f0f536
Author: Isis Lovecruft i...@torproject.org
Date:   Sat Mar 21 02:00:52 2015 +

Merge branch 'master' into develop




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

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

2015-03-20 Thread isis

commit 1343b4b7f100782338bcf3a00932043f692e5941
Merge: 9955bd5 e08b98e
Author: Isis Lovecruft i...@torproject.org
Date:   Tue Feb 3 02:29:15 2015 +

Merge branch 'master' into develop




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

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

2015-02-02 Thread isis

commit 74cdb092998f006a1253aef74e96b3884dd014eb
Merge: 1ed4585 09198e1
Author: Isis Lovecruft i...@torproject.org
Date:   Wed Jul 30 21:15:09 2014 +

Merge branch 'master' into develop

 lib/bridgedb/email/server.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



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

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

2014-07-30 Thread isis

commit 1ed4585488eee4fd3fe62e27cd24069d609fcec2
Merge: 2a6d546 c15167a
Author: Isis Lovecruft i...@torproject.org
Date:   Tue Jul 29 01:24:02 2014 +

Merge branch 'master' into develop




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

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

2014-06-06 Thread isis

commit 6fe6c6538b0284b70e78c2df2f0c289c6f93a792
Merge: b0f56a6 f848aa9
Author: Isis Lovecruft i...@torproject.org
Date:   Fri May 16 18:48:38 2014 +

Merge branch 'master' into develop




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

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

2014-05-16 Thread isis

commit b76a543f82f364c7fa2b343cbbeba35fd66a666c
Merge: 073d5c8 10dd852
Author: Isis Lovecruft i...@torproject.org
Date:   Sat Apr 19 16:59:32 2014 +

Merge branch 'master' into develop




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

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

2014-04-19 Thread isis

commit eb5abdcb75e94f87013a8a865a3f5978dd30c660
Merge: 24dc8dc f266f32
Author: Isis Lovecruft i...@torproject.org
Date:   Wed Mar 26 05:46:59 2014 +

Merge branch 'master' into develop




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

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

2014-03-25 Thread isis

commit d40b410899b3a5f071ba7f750f2db481800a181f
Merge: ac9aa95 783babc
Author: Isis Lovecruft i...@torproject.org
Date:   Sun Mar 16 19:02:28 2014 +

Merge branch 'master' into develop




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

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

2014-03-16 Thread isis

commit befe5d49c53c2c3eff3c1a46535cbc834b6db329
Merge: e5bc105 e2f859c
Author: Isis Lovecruft i...@torproject.org
Date:   Fri Feb 21 23:28:27 2014 +

Merge branch 'master' into develop




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

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

2014-02-21 Thread isis

commit a2aec599ae199d0ddc8b3f2adf7d4455002cae22
Merge: 88569fb 9871642
Author: Isis Lovecruft i...@torproject.org
Date:   Wed Feb 5 22:48:48 2014 +

Merge branch 'master' into develop




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

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

2014-02-21 Thread isis

commit fa67d20ba88a5673c55bc6049f75181ebf119c99
Merge: 26ba67b 564f4b9
Author: Isis Lovecruft i...@torproject.org
Date:   Fri Feb 21 21:55:20 2014 +

Merge branch 'master' into develop




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

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

2014-02-05 Thread isis

commit 44be20d6fbb5578b00ef58ec6340ea72f8aaea86
Merge: 00228a8 3ee91c1
Author: Isis Lovecruft i...@torproject.org
Date:   Tue Feb 4 00:29:33 2014 +

Merge branch 'master' into develop




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

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

2014-02-03 Thread isis

commit fe285af43012ecb3f963949ee5d3e19d4737701b
Merge: 38af253 380820f
Author: Isis Lovecruft i...@torproject.org
Date:   Sun Jan 12 05:37:20 2014 +

Merge branch 'master' into develop




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

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

2014-01-11 Thread isis

commit 549f80db27e6ed6c4d3e152907968c7711b195a5
Merge: 6609e34 0be47e0
Author: Isis Lovecruft i...@torproject.org
Date:   Tue Aug 20 01:28:59 2013 +

Merge branch 'master' into develop




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

39 matches

Mail list logo