* : merge with master

2020-09-09 14:35:11 +03:00
parent b04e12e189 ccb903c9a0
commit e781ff0cae
38 changed files with 1194 additions and 176 deletions
--- a/openapi/openapi.yaml
+++ b/openapi/openapi.yaml
@@ -1565,6 +1565,11 @@ components:
                    format: int32
                    example: 853
                    description: DNS-over-TLS port. If 0, DOT will be disabled.
+                port_dns_over_quic:
+                    type: integer
+                    format: int32
+                    example: 784
+                    description: DNS-over-QUIC port. If 0, DOQ will be disabled.
                certificate_chain:
                    type: string
                    description: Base64 string with PEM-encoded certificates chain