From d8a925a94fbdc4f18eed640eb900631cd8337ed0 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Sat, 12 Mar 2022 15:24:14 +0000
Subject: [PATCH 1/3] Remove Syria and Turkey from list of countries blocking
 Tor.

https://explorer.ooni.org/chart/circumvention?since=2021-12-13&until=2022-03-13&probe_cc=BY%2CCN%2CEG%2CIR%2CRU%2CSY%2CTR%2CVE
---
 .../bramble/plugin/tor/CircumventionProvider.java           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java
index db766324a..8b19f7720 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java
@@ -20,7 +20,7 @@ public interface CircumventionProvider {
 	 * See https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
 	 * and https://trac.torproject.org/projects/tor/wiki/doc/OONI/censorshipwiki
 	 */
-	String[] BLOCKED = {"CN", "IR", "EG", "BY", "TR", "SY", "VE", "RU"};
+	String[] BLOCKED = {"BY", "CN", "EG", "IR", "RU", "VE"};
 
 	/**
 	 * Countries where obfs4 or meek bridge connections are likely to work.
@@ -28,13 +28,13 @@ public interface CircumventionProvider {
 	 * {@link #DEFAULT_OBFS4_BRIDGES}, {@link #NON_DEFAULT_OBFS4_BRIDGES} and
 	 * {@link #MEEK_BRIDGES}.
 	 */
-	String[] BRIDGES = {"CN", "IR", "EG", "BY", "TR", "SY", "VE", "RU"};
+	String[] BRIDGES = {"BY", "CN", "EG", "IR", "RU", "VE"};
 
 	/**
 	 * Countries where default obfs4 bridges are likely to work.
 	 * Should be a subset of {@link #BRIDGES}.
 	 */
-	String[] DEFAULT_OBFS4_BRIDGES = {"EG", "BY", "TR", "SY", "VE"};
+	String[] DEFAULT_OBFS4_BRIDGES = {"BY", "EG", "VE"};
 
 	/**
 	 * Countries where non-default obfs4 bridges are likely to work.

From ec6b999d301adba3e515ff883fc9d05e4cee873d Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Sat, 12 Mar 2022 17:25:11 +0000
Subject: [PATCH 2/3] Belarus needs non-default bridges.

---
 .../bramble/plugin/tor/CircumventionProvider.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java
index 8b19f7720..524159b4d 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java
@@ -34,13 +34,13 @@ public interface CircumventionProvider {
 	 * Countries where default obfs4 bridges are likely to work.
 	 * Should be a subset of {@link #BRIDGES}.
 	 */
-	String[] DEFAULT_OBFS4_BRIDGES = {"BY", "EG", "VE"};
+	String[] DEFAULT_OBFS4_BRIDGES = {"EG", "VE"};
 
 	/**
 	 * Countries where non-default obfs4 bridges are likely to work.
 	 * Should be a subset of {@link #BRIDGES}.
 	 */
-	String[] NON_DEFAULT_OBFS4_BRIDGES = {"RU"};
+	String[] NON_DEFAULT_OBFS4_BRIDGES = {"BY", "RU"};
 
 	/**
 	 * Countries where obfs4 bridges won't work and meek is needed.

From 5da782cf1823e20e9cfca536fb9fef76de7e0c36 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Tue, 15 Mar 2022 12:07:59 +0000
Subject: [PATCH 3/3] Turkmenistan needs non-default bridges.

---
 .../bramble/plugin/tor/CircumventionProvider.java           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java
index 524159b4d..7ecc2d7d2 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java
@@ -20,7 +20,7 @@ public interface CircumventionProvider {
 	 * See https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
 	 * and https://trac.torproject.org/projects/tor/wiki/doc/OONI/censorshipwiki
 	 */
-	String[] BLOCKED = {"BY", "CN", "EG", "IR", "RU", "VE"};
+	String[] BLOCKED = {"BY", "CN", "EG", "IR", "RU", "TM", "VE"};
 
 	/**
 	 * Countries where obfs4 or meek bridge connections are likely to work.
@@ -28,7 +28,7 @@ public interface CircumventionProvider {
 	 * {@link #DEFAULT_OBFS4_BRIDGES}, {@link #NON_DEFAULT_OBFS4_BRIDGES} and
 	 * {@link #MEEK_BRIDGES}.
 	 */
-	String[] BRIDGES = {"BY", "CN", "EG", "IR", "RU", "VE"};
+	String[] BRIDGES = {"BY", "CN", "EG", "IR", "RU", "TM", "VE"};
 
 	/**
 	 * Countries where default obfs4 bridges are likely to work.
@@ -40,7 +40,7 @@ public interface CircumventionProvider {
 	 * Countries where non-default obfs4 bridges are likely to work.
 	 * Should be a subset of {@link #BRIDGES}.
 	 */
-	String[] NON_DEFAULT_OBFS4_BRIDGES = {"BY", "RU"};
+	String[] NON_DEFAULT_OBFS4_BRIDGES = {"BY", "RU", "TM"};
 
 	/**
 	 * Countries where obfs4 bridges won't work and meek is needed.