Merge branch '1267-tor-bridges' into 'master'
Tor Bridge Support See merge request briar/briar!847
No related branches found
No related tags found
Showing
- bramble-android/build.gradle 8 additions, 0 deletionsbramble-android/build.gradle
- bramble-android/src/androidTest/java/org/briarproject/bramble/IntegrationTestComponent.java 23 additions, 0 deletions...va/org/briarproject/bramble/IntegrationTestComponent.java
- bramble-android/src/androidTest/java/org/briarproject/bramble/plugin/tor/BridgeTest.java 126 additions, 0 deletions.../java/org/briarproject/bramble/plugin/tor/BridgeTest.java
- bramble-android/src/androidTest/java/org/briarproject/bramble/plugin/tor/TorPluginCallBack.java 54 additions, 0 deletions...rg/briarproject/bramble/plugin/tor/TorPluginCallBack.java
- bramble-android/src/main/java/org/briarproject/bramble/BrambleAndroidModule.java 14 additions, 0 deletions...n/java/org/briarproject/bramble/BrambleAndroidModule.java
- bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProvider.java 30 additions, 0 deletions...riarproject/bramble/plugin/tor/CircumventionProvider.java
- bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/CircumventionProviderImpl.java 68 additions, 0 deletions...project/bramble/plugin/tor/CircumventionProviderImpl.java
- bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorNetworkMetadata.java 0 additions, 18 deletions...g/briarproject/bramble/plugin/tor/TorNetworkMetadata.java
- bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java 28 additions, 6 deletions...n/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
- bramble-android/src/main/java/org/briarproject/bramble/plugin/tor/TorPluginFactory.java 4 additions, 1 deletion...org/briarproject/bramble/plugin/tor/TorPluginFactory.java
- bramble-android/src/main/res/raw/bridges 5 additions, 0 deletionsbramble-android/src/main/res/raw/bridges
- bramble-api/src/main/java/org/briarproject/bramble/api/lifecycle/IoExecutor.java 1 addition, 1 deletion...va/org/briarproject/bramble/api/lifecycle/IoExecutor.java
- briar-android/src/main/java/org/briarproject/briar/android/AppModule.java 3 additions, 2 deletions...c/main/java/org/briarproject/briar/android/AppModule.java
Loading
Please register or sign in to comment