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

86684e22

Commit 86684e22 authored 6 years ago by akwizgran

Downloads
- Plain Diff

Merge branch 'slow-bridges' into 'master'

Update bridge list, test for slow bridges

See merge request briar/briar!936

parents 905dc2a6 9615eff6

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

bramble-core/src/main/resources/bridges 3 additions, 3 deletions

bramble-core/src/main/resources/bridges
bramble-java/src/test/java/org/briarproject/bramble/plugin/tor/BridgeTest.java 26 additions, 17 deletions

.../java/org/briarproject/bramble/plugin/tor/BridgeTest.java
bramble-java/src/test/java/org/briarproject/bramble/test/BrambleJavaIntegrationTestComponent.java 2 additions, 0 deletions

...ect/bramble/test/BrambleJavaIntegrationTestComponent.java

with 31 additions and 20 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