diff options
| author | cyberta <cyberta@riseup.net> | 2017-10-13 11:08:54 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2017-10-13 11:08:54 +0000 |
| commit | ef98b18734c25da77abe4f0067635cf795218c65 (patch) | |
| tree | c0d4e87751f8720f27c2c1f0b5c5b97bd959c163 /app/src/test/resources/general_configuration.json | |
| parent | ee442a9ee54face7a8f71fc0428ff6d1184e382f (diff) | |
| parent | de722d9c14a0ce4353d677081b077efe15eb9525 (diff) | |
Merge branch '8746_client_must_honor_specified_protocol' into 'master'
#8746 fixes client must honor the protocol default specified by the provider
See merge request leap/bitmask_android!10
Diffstat (limited to 'app/src/test/resources/general_configuration.json')
| -rw-r--r-- | app/src/test/resources/general_configuration.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/src/test/resources/general_configuration.json b/app/src/test/resources/general_configuration.json new file mode 100644 index 00000000..33b0c0b5 --- /dev/null +++ b/app/src/test/resources/general_configuration.json @@ -0,0 +1 @@ +{"auth":"SHA1","cipher":"AES-128-CBC","keepalive":"10 30","tls-cipher":"DHE-RSA-AES128-SHA","tun-ipv6":true}
\ No newline at end of file |