Merge branch 'master' into add-entrance-id

# Conflicts: # src/tsg_send_log.cpp
2020-11-04 17:06:50 +06:00
parent cb544e9c4f 24b9ce5ad5
commit 39335c9543
5 changed files with 9 additions and 6 deletions
--- a/bin/tsg_log_field.conf
+++ b/bin/tsg_log_field.conf
@@ -43,9 +43,9 @@ STRING		http_host		35
 STRING		ssl_sni			36
 LONG		common_establish_latency_ms	37
 STRING		common_sub_action		38
-STRING		common_clinet_asn	39
+STRING		common_client_asn	39
 STRING		common_server_asn	40
-STRING		common_clinet_location	41
+STRING		common_client_location	41
 STRING		common_server_location	42
 STRING		quic_sni			43
 STRING		ssl_ja3_fingerprint		44