akwizgran 9fd6d46583 Merge branch '871-increase-socket-timeout' into 'master' ...

Increase socket timeout for Tor sockets

See merge request !519

2017-04-19 16:53:59 +00:00

..

main/java/org/briarproject/bramble

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

2017-04-19 16:53:59 +00:00

test/java/org/briarproject/bramble

Moved test utility classes into test package.

2016-12-14 15:42:52 +00:00