Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

90b7b4e6

Commit 90b7b4e6 authored 6 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '1416-obfs4' into 'master'

Add obfs4proxy and switch to obfs4 bridges

Closes #1417

See merge request briar/briar!964

parents 6565172e 2db2a1a2

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

bramble-android/build.gradle 1 addition, 0 deletions

bramble-android/build.gradle
bramble-core/src/main/java/org/briarproject/bramble/plugin/tor/TorPlugin.java 20 additions, 1 deletion

...n/java/org/briarproject/bramble/plugin/tor/TorPlugin.java
bramble-core/src/main/resources/bridges 4 additions, 8 deletions

bramble-core/src/main/resources/bridges
bramble-java/build.gradle 1 addition, 0 deletions

bramble-java/build.gradle

with 26 additions and 9 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment