Merge branch '871-increase-socket-timeout' into 'master' (9fd6d465) · 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

9fd6d465

Commit 9fd6d465 authored 8 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '871-increase-socket-timeout' into 'master'

Increase socket timeout for Tor sockets

See merge request !519

parents 67d5d8cd d17669f1

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

bramble-api/src/main/java/org/briarproject/bramble/api/plugin/TorConstants.java 1 addition, 0 deletions

...ava/org/briarproject/bramble/api/plugin/TorConstants.java
bramble-core/src/main/java/org/briarproject/bramble/socks/SocksModule.java 3 additions, 1 deletion

...main/java/org/briarproject/bramble/socks/SocksModule.java
bramble-core/src/main/java/org/briarproject/bramble/socks/SocksSocket.java 9 additions, 7 deletions

...main/java/org/briarproject/bramble/socks/SocksSocket.java
bramble-core/src/main/java/org/briarproject/bramble/socks/SocksSocketFactory.java 5 additions, 3 deletions

...va/org/briarproject/bramble/socks/SocksSocketFactory.java

with 18 additions and 11 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