Merge branch 'more-non-default-bridges' into 'master'
Vanilla bridges See merge request !1611
Showing
- bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java 12 additions, 10 deletions...riarproject/bramble/plugin/tor/CircumventionProvider.java
- bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImpl.java 15 additions, 15 deletions...project/bramble/plugin/tor/CircumventionProviderImpl.java
- bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java 15 additions, 9 deletions...n/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
- bramble-core/src/main/resources/bridges 9 additions, 2 deletionsbramble-core/src/main/resources/bridges
- bramble-core/src/test/java/org/briarproject/bramble/plugin/tor/CircumventionProviderTest.java 22 additions, 18 deletions...project/bramble/plugin/tor/CircumventionProviderTest.java
- bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java 7 additions, 5 deletions.../java/org/briarproject/bramble/plugin/tor/BridgeTest.java
Loading
Please register or sign in to comment