Merge pull request #1 from chengr28/master

merge from upstream

Merge pull request #1 from chengr28/master
merge from upstream
b6a56e32 · phoeagon · e6480b7b · 6b7fbe76 · b6a56e32 · b6a56e32
Commit b6a56e32 authored 10 years ago by phoeagon
--- a/Windows/Certs/China_Internet_Network_Information_Center_EV_Certificates_Root.crt
+++ b/Windows/Certs/China_Internet_Network_Information_Center_EV_Certificates_Root.crt
--- a/Windows/Certs/Class_1_Primary_CA.crt
+++ b/Windows/Certs/Class_1_Primary_CA.crt
--- a/Windows/Certs/GiantRootCA.crt
+++ b/Windows/Certs/GiantRootCA.crt
--- a/Windows/Certs/Government_Root_Certification_Authority.crt
+++ b/Windows/Certs/Government_Root_Certification_Authority.crt
--- a/Windows/Certs/Hongkong_Post_Root_CA.crt
+++ b/Windows/Certs/Hongkong_Post_Root_CA.crt
--- a/Windows/Certs/Hongkong_Post_Root_CA_1.crt
+++ b/Windows/Certs/Hongkong_Post_Root_CA_1.crt
--- a/Windows/Certs/JGZXCA.crt
+++ b/Windows/Certs/JGZXCA.crt
--- a/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority.crt
+++ b/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority.crt
--- a/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt
+++ b/Windows/Certs/Macao_Post_eSignTrust_Root_Certification_Authority_G02.crt
--- a/Windows/Certs/SRCA.crt
+++ b/Windows/Certs/SRCA.crt
--- a/Windows/Certs/Superfish_Inc.crt
+++ b/Windows/Certs/Superfish_Inc.crt
--- a/Windows/Certs/TWCA_Global_Root_CA.crt
+++ b/Windows/Certs/TWCA_Global_Root_CA.crt
--- a/Windows/Certs/TWCA_Root_Certification_Authority_1.crt
+++ b/Windows/Certs/TWCA_Root_Certification_Authority_1.crt
--- a/Windows/Certs/TWCA_Root_Certification_Authority_2.crt
+++ b/Windows/Certs/TWCA_Root_Certification_Authority_2.crt
--- a/Windows/Certs/TWCA_Secure_CA_Baltimore.crt
+++ b/Windows/Certs/TWCA_Secure_CA_Baltimore.crt
--- a/Windows/Certs/TWCA_Secure_Certification_Authority_USERTrust.crt
+++ b/Windows/Certs/TWCA_Secure_Certification_Authority_USERTrust.crt
--- a/Windows/Certs/TaiCA_Secure_CA_GTE.crt
+++ b/Windows/Certs/TaiCA_Secure_CA_GTE.crt
--- a/Windows/Certs/UCA_Extended_Validation_Root.crt
+++ b/Windows/Certs/UCA_Extended_Validation_Root.crt
--- a/Windows/Certs/UCA_Global_Root.crt
+++ b/Windows/Certs/UCA_Global_Root.crt
--- a/Windows/Certs/UCA_Root_200101.crt
+++ b/Windows/Certs/UCA_Root_200101.crt