From ef187951c8da9e98877c0d857b8829a6e30dbcdb Mon Sep 17 00:00:00 2001 From: Giovanni Pellerano Date: Tue, 1 Oct 2019 15:32:22 +0200 Subject: [PATCH 1/4] Revise README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 698d22bc..3d3526fd 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Tor2web is an HTTP proxy software that enables access to Tor Hidden Services by mean of common web browsers -The software originally developed by [Aaron Swartz](https://en.wikipedia.org/wiki/Aaron_Swartz) and [Virgil Griffith](https://en.wikipedia.org/wiki/Virgil_Griffith) is now developed and mainteined by the [Hermes Center for Transparency and Digital Human Rights](https://www.hermescenter.org) as part of the ([GlobaLeaks](https://github.com/globaleaks/GlobaLeaks/wiki/)) project. +The software originally developed by [Aaron Swartz](https://en.wikipedia.org/wiki/Aaron_Swartz) and [Virgil Griffith](https://en.wikipedia.org/wiki/Virgil_Griffith) is now developed and mainteined by the [Hermes Center for Transparency and Digital Human Rights](https://www.hermescenter.org) as part of the [GlobaLeaks](https://github.com/globaleaks/GlobaLeaks/wiki/) project. ## Build status: [![Build Status](https://travis-ci.org/globaleaks/Tor2web.svg?branch=master)](https://travis-ci.org/globaleaks/Tor2web) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/9278ba439d154cf783d9a84743b174f4)](https://www.codacy.com/app/GlobaLeaks/Tor2web?utm_source=github.com&utm_medium=referral&utm_content=globaleaks/Tor2web&utm_campaign=Badge_Grade) From 63d9e29d1703a06c900b49ada3d9a355225afe7a Mon Sep 17 00:00:00 2001 From: Giovanni Pellerano Date: Sat, 26 Oct 2019 08:19:07 +0200 Subject: [PATCH 2/4] Add FUNDING.yml --- .github/FUNDING.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..7eacbfdb --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,2 @@ +github: [evilaliv3] +custom: ["https://www.globaleaks.org/donate/"] From f93c61f59a083b6e1273aeceb21fd00673aa7472 Mon Sep 17 00:00:00 2001 From: Giovanni Pellerano Date: Wed, 13 Jul 2022 10:53:16 +0200 Subject: [PATCH 3/4] Apply repository cleanup --- README.md | 9 ++-- data/static/decoy.html | 116 ----------------------------------------- debian/copyright | 2 +- docs/index.html | 33 ++---------- misc/checktor.html | 43 --------------- misc/checktor.js | 41 --------------- 6 files changed, 10 insertions(+), 234 deletions(-) delete mode 100644 data/static/decoy.html delete mode 100644 misc/checktor.html delete mode 100644 misc/checktor.js diff --git a/README.md b/README.md index 3d3526fd..c5f89546 100644 --- a/README.md +++ b/README.md @@ -4,18 +4,17 @@ Tor2web is an HTTP proxy software that enables access to Tor Hidden Services by mean of common web browsers -The software originally developed by [Aaron Swartz](https://en.wikipedia.org/wiki/Aaron_Swartz) and [Virgil Griffith](https://en.wikipedia.org/wiki/Virgil_Griffith) is now developed and mainteined by the [Hermes Center for Transparency and Digital Human Rights](https://www.hermescenter.org) as part of the [GlobaLeaks](https://github.com/globaleaks/GlobaLeaks/wiki/) project. +The software was originally developed by [Aaron Swartz](https://en.wikipedia.org/wiki/Aaron_Swartz) and [Virgil Griffith](https://en.wikipedia.org/wiki/Virgil_Griffith) and is now mainteined by [Giovanni Pellerano](https://github.com/evilaliv3) as part of the [GlobaLeaks](https://github.com/globaleaks/GlobaLeaks/wiki/) project. -## Build status: [![Build Status](https://travis-ci.org/globaleaks/Tor2web.svg?branch=master)](https://travis-ci.org/globaleaks/Tor2web) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/9278ba439d154cf783d9a84743b174f4)](https://www.codacy.com/app/GlobaLeaks/Tor2web?utm_source=github.com&utm_medium=referral&utm_content=globaleaks/Tor2web&utm_campaign=Badge_Grade) +## Build status: [![Build Status](https://travis-ci.com/tor2web/Tor2web.svg?branch=main)](https://travis-ci.com/tor2web/Tor2web) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/595a4edb1a9d4425b80c6e6a1c6c9ef4)](https://www.codacy.com/gh/tor2web/Tor2web/dashboard?utm_source=github.com&utm_medium=referral&utm_content=tor2web/Tor2web&utm_campaign=Badge_Grade) ## Documentation * Official website: [www.tor2web.org](https://www.tor2web.org/) -* Documentation on Wiki: [Github Wiki](https://github.com/globaleaks/tor2web/wiki) ## Donate To support the Tor2web project you can help us with donations that will goes entirely for the software development. -[Help us by sending us a small donation!](https://www.hermescenter.org/home/about-mission/support-us/) +[Help us by sending us a small donation!](https://www.globaleaks.org/get-involved/donate/) ## Contacts * Join [#tor2web](https://webchat.oftc.net/?nick=gl-guest.&channels=tor2web), our IRC chat channel on the `irc.oftc.net` server. @@ -25,4 +24,4 @@ To support the Tor2web project you can help us with donations that will goes ent ## License This software is released under the AGPLv3 license. See LICENSE file for more information. -Copyright (c) 2011-2019 - [Hermes Center for Transparency and Digital Human Rights](https://www.hermescenter.org) +Copyright (c) 2011-2022 - [Hermes Center for Transparency and Digital Human Rights](https://www.hermescenter.org) diff --git a/data/static/decoy.html b/data/static/decoy.html deleted file mode 100644 index fa34f132..00000000 --- a/data/static/decoy.html +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - CoverT - - -

Please make me look pretty

- - - - diff --git a/debian/copyright b/debian/copyright index e04633fc..b9415af4 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,5 +1,5 @@ Format: http://dep.debian.net/deps/dep5 Files: * -Copyright: © 2011-2014, Hermes No Profit Association +Copyright: © 2011-2022, Tor2web License: AGPL-3.1+ diff --git a/docs/index.html b/docs/index.html index 65e1c806..d969bced 100644 --- a/docs/index.html +++ b/docs/index.html @@ -27,8 +27,6 @@

Tor2web & Tor Onion Sites Resources

@@ -43,29 +41,10 @@

Contribute to the Tor2web Project

Support us

-You can donate to Hermes Center to support Tor2web project development. +You can donate to the GlobaLeaks project to support Tor2web project development.

-

Read more

- - - -

Additional Services

-Tor2web do provide also additional services, not just proxy access to Tor Onion Services, in particular the following faclities: -
    -
  • CheckTor to integrate in your site a JS to check if user is coming from Tor
    • -
  • OpenData statistcs of Tor2web let you research how Tor2web network behave
    • -
-

Contacts

If you wish to contact the Tor2web Projects you can reach us on:
    @@ -76,10 +55,8 @@

    Contacts

    -
    -Tor2Web was originally developed by Aaron Swartz and Virgil Griffith and is
    -developed and mainteined by the HERMES Center for Transparency and Digital Human Rights
    +
    +Tor2Web was originally developed by Aaron Swartz and Virgil Griffith. The project is currently mainteined by Giovanni Pellerano as part of the GlobaLeaks project.
    To report abuse, please write to the Tor2web Operators Mailing List tor2web-abuse@lists.tor2web.og
    -
    - - + + diff --git a/misc/checktor.html b/misc/checktor.html deleted file mode 100644 index b23f4151..00000000 --- a/misc/checktor.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - Example of usage of CheckTor.js - - - - - - - - - - - - - diff --git a/misc/checktor.js b/misc/checktor.js deleted file mode 100644 index 582159a8..00000000 --- a/misc/checktor.js +++ /dev/null @@ -1,41 +0,0 @@ -/* - Copyright 2011-2016 - Hermes Center - GlobaLeaks project - Author - - Javascript CheckTor library -*/ - -function checkTor(yes_cb, no_cb, test_url) { - // Test if the user is using Tor and in that case - // redirects the user to provided url - try { - if (typeof(test_url) === 'undefined') { - var test_url = 'https://antani.tor2web.org/checktor'; - } - if (window.XMLHttpRequest) { - var xmlhttp = new XMLHttpRequest(); - - xmlhttp.onreadystatechange=function() { - if (xmlhttp.readyState==4 && xmlhttp.status==200) { - if (xmlhttp.getResponseHeader("x-check-tor") === "true") { - if (yes_cb) yes_cb(); - } else { - if (no_cb) no_cb(); - } - } - } - - xmlhttp.open("GET", test_url, true); - xmlhttp.send(); - - } - } catch(err) {} -} - -function redirectIfOnTor(url, test_url) { - var yes_cb = function () { - window.location.href = url; - } - - checkTor(yes_cb, undefined, test_url); -} From 07839ada4058c8c0e24916415457f1b6de46609b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Jul 2022 07:28:29 +0000 Subject: [PATCH 4/4] Bump cryptography from 2.1.4 to 3.3.2 in /requirements Bumps [cryptography](https://github.com/pyca/cryptography) from 2.1.4 to 3.3.2. - [Release notes](https://github.com/pyca/cryptography/releases) - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/2.1.4...3.3.2) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements/requirements-bionic.txt | 2 +- requirements/requirements-buster.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements-bionic.txt b/requirements/requirements-bionic.txt index 907f38a3..dc10c211 100644 --- a/requirements/requirements-bionic.txt +++ b/requirements/requirements-bionic.txt @@ -1,7 +1,7 @@ Parsley==1.2 Twisted==17.9.0 cffi==1.11.5 -cryptography==2.1.4 +cryptography==3.3.2 enum34==1.1.6 idna==2.6 pyOpenSSL==17.5.0 diff --git a/requirements/requirements-buster.txt b/requirements/requirements-buster.txt index 0f509fd8..4fa27ab3 100644 --- a/requirements/requirements-buster.txt +++ b/requirements/requirements-buster.txt @@ -1,7 +1,7 @@ Parsley==1.2 Twisted==18.9.0 cffi==1.12.2 -cryptography==2.6.1 +cryptography==3.3.2 enum34==1.1.6 idna==2.6 pyOpenSSL==19.0.0