Merge branch '3-4-10-wrapper-states' into 'master' (2ee68f44) · Commits · briar / Onion Wrapper · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

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

Snippets Groups Projects

2ee68f44

Commit 2ee68f44 authored 1 year ago by Torsten Grote

Downloads
- Plain Diff

Merge branch '3-4-10-wrapper-states' into 'master'

Add more wrapper states, allow wrapper to be reused

Closes #10, #4, and #3

See merge request !9

parents 88d61cbe db9ebfd6

Loading

Checking pipeline status

Changes 6
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

onionwrapper-android/src/main/java/org/briarproject/onionwrapper/AndroidTorWrapper.java 16 additions, 23 deletions

...java/org/briarproject/onionwrapper/AndroidTorWrapper.java
onionwrapper-core/src/main/java/org/briarproject/onionwrapper/AbstractTorWrapper.java 114 additions, 47 deletions

...ava/org/briarproject/onionwrapper/AbstractTorWrapper.java
onionwrapper-core/src/main/java/org/briarproject/onionwrapper/TorWrapper.java 55 additions, 9 deletions

...c/main/java/org/briarproject/onionwrapper/TorWrapper.java
onionwrapper-java/src/main/java/org/briarproject/onionwrapper/JavaTorWrapper.java 3 additions, 6 deletions

...in/java/org/briarproject/onionwrapper/JavaTorWrapper.java
onionwrapper-java/src/main/java/org/briarproject/onionwrapper/WindowsTorWrapper.java 1 addition, 46 deletions

...java/org/briarproject/onionwrapper/WindowsTorWrapper.java
onionwrapper-java/src/test/java/org/briarproject/onionwrapper/BootstrapTest.java 12 additions, 1 deletion

...est/java/org/briarproject/onionwrapper/BootstrapTest.java

with 201 additions and 132 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