Merge branch '228-jsocks' into 'master' (d33dbca2) · Commits · Julian Dehm / briar · GitLab

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

d33dbca2

Commit d33dbca2 authored 9 years ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '228-jsocks' into 'master'

Replaced broken jsocks jar. #228

Fixes #228 and may also fix #217. @str4d and @grote, please test and confirm.

See merge request !72

parents aacd3473 3b510e76

No related branches found

No related tags found

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/build.gradle 0 additions, 2 deletions

briar-android/build.gradle
briar-android/libs/jsocks.jar 0 additions, 0 deletions

briar-android/libs/jsocks.jar
briar-android/src/org/briarproject/plugins/tor/TorPlugin.java 4 additions, 5 deletions

...r-android/src/org/briarproject/plugins/tor/TorPlugin.java

with 4 additions and 7 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