Merge branch 'master' into dev

openvpn/btguard/btguard.ca.crt

@@ -1,21 +1,20 @@
 -----BEGIN CERTIFICATE-----
-MIIDcjCCAtugAwIBAgIJAPKjuBleHokmMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD
-VQQGEwJERTEVMBMGA1UECBMMSGVzc2UtTmFzc2F1MRIwEAYDVQQHEwlGcmFua2Z1
-cnQxEDAOBgNVBAoTB0JUR3VhcmQxEzARBgNVBAMTCkJUR3VhcmQgQ0ExIjAgBgkq
-hkiG9w0BCQEWE3N1cHBvcnRAYnRndWFyZC5jb20wHhcNMTAwODA3MDc0NTA5WhcN
-MjAwODA0MDc0NTA5WjCBgzELMAkGA1UEBhMCREUxFTATBgNVBAgTDEhlc3NlLU5h
-c3NhdTESMBAGA1UEBxMJRnJhbmtmdXJ0MRAwDgYDVQQKEwdCVEd1YXJkMRMwEQYD
-VQQDEwpCVEd1YXJkIENBMSIwIAYJKoZIhvcNAQkBFhNzdXBwb3J0QGJ0Z3VhcmQu
-Y29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4cBR6VLQICqdpTsjosIQ5
-9elQZSRNQFaxWW3MeRC1xpJqjkbLJ9B9IO/Q/UyOa4a3qYHg8rI43wIF/RR6bwNX
-3sZ5w6TrdVBk0DFZq6lDQ8/4Kpg1dKbdAgJjvtxiyrHWFtB0jYVGTlxwBSPflc2J
-RZDMAVVj83gQh8ODJeGjnwIDAQABo4HrMIHoMB0GA1UdDgQWBBQCj1U+EICMz8hF
-++KZ8Ld1vR0sqTCBuAYDVR0jBIGwMIGtgBQCj1U+EICMz8hF++KZ8Ld1vR0sqaGB
-iaSBhjCBgzELMAkGA1UEBhMCREUxFTATBgNVBAgTDEhlc3NlLU5hc3NhdTESMBAG
-A1UEBxMJRnJhbmtmdXJ0MRAwDgYDVQQKEwdCVEd1YXJkMRMwEQYDVQQDEwpCVEd1
-YXJkIENBMSIwIAYJKoZIhvcNAQkBFhNzdXBwb3J0QGJ0Z3VhcmQuY29tggkA8qO4
-GV4eiSYwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAgVeYTxvAonucE
-qWloEvzCCUWs8bS/HJ6M85WzG7FPNAXx2QbWwN3EMwKxtGc7QF8f+APoMukzsvd2
-vuI+1n0YwtD12cWMM9PLV2FhA2B+ajzssBTgvrbtX/SzKt0//lzrBp5Gyo6T/vO5
-9KRb6DVfVWfB76+DLpTf9f3SLTgzKw==
+MIIDQTCCAimgAwIBAgIJAJV9QqE+ZzsXMA0GCSqGSIb3DQEBCwUAMBoxGDAWBgNV
+BAMMD3Zwbi5idGd1YXJkLmNvbTAeFw0yMDA4MDUxMzUzNDhaFw00MTAyMTYxMzUz
+NDhaMBoxGDAWBgNVBAMMD3Zwbi5idGd1YXJkLmNvbTCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBAMxVmPrlfsHocRYR1D/kOj47ZRZDv2XG2Z5rkq1ode/a
+jMSV082EqKhhIE2o6f03abXhWe8VSoM2ZPoB0818x7WIYeoXzaHJQooZTyKjCpm2
+8Fz/XDvyShZpyKUZPjuoo9UxNWDEhnMHJegtL9ccJGXWRrbgUjvrOsiyiiAolftu
+8MjSYRTveuARxMyIlMNAXMaG2r3H2tM1QGoDdCn6FaMBYl4JOExXsOtofjGcRxcb
+MLQLYkORwTwx7TGTacQizsFxg9pSF7jNQwgHtIjZ5fY6SLgmFHEFOaP0mbuHTF9I
+6e58ACbkJ4wuk4IVTXup80c8Zsr+yBFGM8pB5pqEBj0CAwEAAaOBiTCBhjAdBgNV
+HQ4EFgQUhHt2BX7StG7Op1OaZCosAicYJvMwSgYDVR0jBEMwQYAUhHt2BX7StG7O
+p1OaZCosAicYJvOhHqQcMBoxGDAWBgNVBAMMD3Zwbi5idGd1YXJkLmNvbYIJAJV9
+QqE+ZzsXMAwGA1UdEwQFMAMBAf8wCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBCwUA
+A4IBAQDB/OX+2GJB1Zql1DNVoQst1V/5y/AzKUclCpQb5VVpGU3hrXw1GD/HnVaU
+Mwq8e+C9+FgJNXh0LtpOuksr7YD0IMie4h0rXh1U8tLk1Zh5gLcq5RPee/CK44Qs
+E2X5BUdWfOyL4AkoBAvk2roy25plk4rlOLleUKsHl1qqXMB/o3n+o90pnRKsYZZ4
+PAZGB39DDO9ANTX/CzRXC+GKpTnmEB5KiIJzuDCHI9HeEv9LTGMhZaCvSjJhPuA9
+VuotY2nOSJ9jO/K7aa2Q9dXVbKXYWo29nq0EUGomo/WwzX8ABAP/RLyESDDIukFA
+T1Ip5RClcWgkxPlQdzCxhGJ5iEJ0
 -----END CERTIFICATE-----

openvpn/btguard/btguard.ovpn

@@ -11,6 +11,10 @@ mute 3
 mute-replay-warnings
 float
 reneg-sec 0
+cipher AES-256-CBC
+auth SHA512
+fast-io
+pull
 
 ca /etc/openvpn/btguard/btguard.ca.crt
 auth-user-pass /config/openvpn-credentials.txt