Merge branch 'master' into 1914-refused-blocking-mode

2020-09-09 13:51:53 +03:00
parent 366fdab605 ccb903c9a0
commit 1fadc27615
50 changed files with 1532 additions and 236 deletions
--- a/openapi/openapi.yaml
+++ b/openapi/openapi.yaml
@@ -1564,6 +1564,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