Merge remote-tracking branch 'syncthing/pr/1995'

* syncthing/pr/1995: Add switch to disable relays Do not start relay service unless explicitly asked for, or global announcement server is running Add dynamic relay lookup (DDoS relays.syncthing.net!) Discovery clients now take an announcer, global discovery is delayed Expose connection type and relay status in the UI Add dependencies (fixes #1364) Check relays for available devices Add incoming connection relay service Add unsubscribe to config Connections have types Large refactoring/feature commit
syncthing · Aug 20, 2015 · c87faac · c87faac
2 parents e2be051 + 1e8b185
commit c87faac
Show file tree

Hide file tree

Showing 37 changed files with 2,476 additions and 440 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/syncthing/relaysrv/client/client.go b/Godeps/_workspace/src/github.com/syncthing/relaysrv/client/client.go
diff --git a/Godeps/_workspace/src/github.com/syncthing/relaysrv/client/debug.go b/Godeps/_workspace/src/github.com/syncthing/relaysrv/client/debug.go