Derive key from ADDR:PORT||FINGERPRINT to prevent collisions. authored by Philipp Winter's avatar Philipp Winter
...@@ -5,7 +5,7 @@ Tor Browser ships with a number of default bridges. These bridges are hard-coded ...@@ -5,7 +5,7 @@ Tor Browser ships with a number of default bridges. These bridges are hard-coded
* [​tor-android-service](https://gitweb.torproject.org/tor-android-service.git/tree/service/src/main/assets/common/bridges.txt) * [​tor-android-service](https://gitweb.torproject.org/tor-android-service.git/tree/service/src/main/assets/common/bridges.txt)
* [monit-configuration](https://gitlab.torproject.org/tpo/anti-censorship/monit-configuration) * [monit-configuration](https://gitlab.torproject.org/tpo/anti-censorship/monit-configuration)
* [emma](https://gitlab.torproject.org/tpo/anti-censorship/emma) * [emma](https://gitlab.torproject.org/tpo/anti-censorship/emma)
*[OONI](https://github.com/ooni/sysadmin/blob/master/ansible/roles/probe-services/templates/tor_targets.json) (Default bridges are indexed by a value that's determined as follows: `echo -n BRIDGE_FINGERPRINT | xxd -r -p | sha256sum`) *[OONI](https://github.com/ooni/sysadmin/blob/master/ansible/roles/probe-services/templates/tor_targets.json) (Default bridges are indexed by a value that's determined as follows: `echo -n ADDR:PORT || BRIDGE_FINGERPRINT | xxd -r -p | sha256sum`)
The following repositories (used to) use default bridges but don't require updates: The following repositories (used to) use default bridges but don't require updates:
*[Onion Browser](https://github.com/OnionBrowser/OnionBrowser/blob/2.X/OnionBrowser/OnionManager.swift) (Onion Browser now fetches and parses bridge_prefs.js automatically.) *[Onion Browser](https://github.com/OnionBrowser/OnionBrowser/blob/2.X/OnionBrowser/OnionManager.swift) (Onion Browser now fetches and parses bridge_prefs.js automatically.)
... ...
......