Merge branch 'update-bridge-config' into 'master'

Update circumvention config

See merge request briar/briar!1604
This commit is contained in:
akwizgran
2022-03-15 12:52:22 +00:00

View File

@@ -20,7 +20,7 @@ public interface CircumventionProvider {
* See https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 * See https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
* and https://trac.torproject.org/projects/tor/wiki/doc/OONI/censorshipwiki * 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", "TM", "VE"};
/** /**
* Countries where obfs4 or meek bridge connections are likely to work. * Countries where obfs4 or meek bridge connections are likely to work.
@@ -28,19 +28,19 @@ public interface CircumventionProvider {
* {@link #DEFAULT_OBFS4_BRIDGES}, {@link #NON_DEFAULT_OBFS4_BRIDGES} and * {@link #DEFAULT_OBFS4_BRIDGES}, {@link #NON_DEFAULT_OBFS4_BRIDGES} and
* {@link #MEEK_BRIDGES}. * {@link #MEEK_BRIDGES}.
*/ */
String[] BRIDGES = {"CN", "IR", "EG", "BY", "TR", "SY", "VE", "RU"}; String[] BRIDGES = {"BY", "CN", "EG", "IR", "RU", "TM", "VE"};
/** /**
* Countries where default obfs4 bridges are likely to work. * Countries where default obfs4 bridges are likely to work.
* Should be a subset of {@link #BRIDGES}. * Should be a subset of {@link #BRIDGES}.
*/ */
String[] DEFAULT_OBFS4_BRIDGES = {"EG", "BY", "TR", "SY", "VE"}; String[] DEFAULT_OBFS4_BRIDGES = {"EG", "VE"};
/** /**
* Countries where non-default obfs4 bridges are likely to work. * Countries where non-default obfs4 bridges are likely to work.
* Should be a subset of {@link #BRIDGES}. * Should be a subset of {@link #BRIDGES}.
*/ */
String[] NON_DEFAULT_OBFS4_BRIDGES = {"RU"}; String[] NON_DEFAULT_OBFS4_BRIDGES = {"BY", "RU", "TM"};
/** /**
* Countries where obfs4 bridges won't work and meek is needed. * Countries where obfs4 bridges won't work and meek is needed.