Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

BriarWithLoRa
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

d572ae71

Commit d572ae71 authored 3 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch 'more-non-default-bridges' into 'master'

Vanilla bridges

See merge request briar/briar!1611

parents 2e9d9dac fa0610ff

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

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 deletions

bramble-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

with 80 additions and 59 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