Merge branch '908-rss-import-dns-leak' into 'master' (a9053808) · 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

a9053808

Commit a9053808 authored 7 years ago by akwizgran

Downloads
- Plain Diff

Merge branch '908-rss-import-dns-leak' into 'master'

Don't make DNS lookups during RSS import

Closes #908

See merge request !488

parents d9a62a04 9c414378

No related branches found

No related tags found

Loading

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

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

...main/java/org/briarproject/bramble/socks/SocksSocket.java
briar-core/src/main/java/org/briarproject/briar/feed/FeedManagerImpl.java 16 additions, 0 deletions

...ain/java/org/briarproject/briar/feed/FeedManagerImpl.java

with 45 additions and 5 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