Bump cryptography from 2.1.4 to 3.3.2 in /requirements

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [evilaliv3]
+custom: ["https://www.globaleaks.org/donate/"]

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)

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+

docs/index.html

@@ -27,8 +27,6 @@ <h2>Tor2web & Tor Onion Sites Resources</h2>
 <ul>
   <li><a href="https://ahmia.fi/address/" target="_blank">Ahmia Directory of Tor Onion sites</a></li>
   <li><a href="https://ahmia.fi/search/" target="_blank">Ahmia Search Engine for Tor Onion site</a></li>
-  <li><a href="http://onion.city" target="_blank">Onion City: Google+Tor2web Powered search engine for Tor Onion Site</a></li>
-  <li><a href="https://en.wikipedia.org/wiki/GlobaLeaks#Implementations" target="_blank">GlobaLeaks+Tor2web Whistleblowing Sites</a></li>
 </ul>
 
 
@@ -43,29 +41,10 @@ <h2>Contribute to the Tor2web Project</h2>
 
 
 <h2>Support us</h2>
-You can donate to <a href="https://www.hermescenter.org/home/about-mission/support-us/">Hermes Center</a> to support Tor2web project development.
+You can donate to the <a href="https://www.globaleaks.org/get-involved/donate/">GlobaLeaks</a> project to support Tor2web project development.
 <br>
 <br>
 
-<h2>Read more</h2>
-
-<ul>
-  <li>2015 StackExchange: <a href="http://tor.stackexchange.com/questions/3898/what-are-the-best-tor2web-anonymous-gateways" target="_blank">What are the best Tor2Web anonymous gateways?</a>
-  <li>2014: Ahmia <a target="_blank" href="https://www.ahmia.fi/stats/tor2web">Tor2web Statistics</a></li>
-  <li>2013: e-privacy tor2web talk (pellerano) <a href="http://urna.winstonsmith.org/materiali/2013/atti/16_ep2013_pellerano_tor2web.pdf" target="_blank">Tor2web: exposing the darknet on Internet</a></li>
-  <li>2012: e-privacy tor2web talk (pietrosanti) <a href="http://urna.winstonsmith.org/materiali/2012/atti/Pietrosanti_Tor2web.pdf" target="_blank">Tor2web Past, Present, Future of anonymous Publishing Infrastructure</a></li>
-  <li>2008: Wired: <a href="http://blog.wired.com/27bstroke6/2008/12/tor-anonymized.html">New Service Makes Tor Anonymized Content Available to All</a></li>
-  <li>2008: Ars Technica: <a href="http://arstechnica.com/old/content/2008/12/tor2web-brings-anonymous-tor-sites-to-the-regular-web.ars">Tor2web brings anonymous Tor sites to the "regular" web</a></li>
-  <li>2008: Tor blog: <a href="http://blog.torproject.org/blog/quick-thoughts-tor2web">Quick thoughts on Tor2web</a></li>
-</ul>
-
-<h2>Additional Services</h2>
-Tor2web do provide also additional services, not just proxy access to Tor Onion Services, in particular the following faclities:
-<ul>
-  <li> <a href="https://github.com/globaleaks/Tor2web/wiki/CheckTor" target="_blank">CheckTor</a> to integrate in your site a JS to check if user is coming from Tor</li>
-  <li> <a href="https://github.com/globaleaks/Tor2web/wiki/OpenData" target="_blank">OpenData</a> statistcs of Tor2web let you research how Tor2web network behave</li>
-</ul>
-
 <h2>Contacts</h2>
 If you wish to contact the Tor2web Projects you can reach us on:
 <ul>
@@ -76,10 +55,8 @@ <h2>Contacts</h2>
 
 </div>
 
-<address>
-Tor2Web was originally developed by <strong><a href="http://en.wikipedia.org/wiki/Aaron_Swartz" target="_blank">Aaron Swartz</a></strong> and <strong><a href="http://virgil.gr/" target="_blank">Virgil Griffith</a></strong> and is<br>
-developed and mainteined by the <a href="http://logioshermes.org/home/projects-technologies/tor2web/">HERMES Center for Transparency and Digital Human Rights</a><br/>
+<div>
+Tor2Web was originally developed by <strong><a href="http://en.wikipedia.org/wiki/Aaron_Swartz" target="_blank">Aaron Swartz</a></strong> and <strong><a href="http://virgil.gr/" target="_blank">Virgil Griffith</a></strong>. The project is currently mainteined by <a href="https://github.com/evilaliv3" target="_blank">Giovanni Pellerano</a> as part of the <a href="https://www.globaleaks.org/" target="_blank">GlobaLeaks</a> project.<br/>
 To report abuse, please write to the Tor2web Operators Mailing List <a href="mailto:[email protected]">[email protected]</a><br/>
-</address>
-</body>
-</html>
+</div>
+</body></html>

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

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