Merge branch 'devel' into ops

getlantern · Jun 4, 2016 · a1f5c14 · a1f5c14
2 parents c5b02a4 + 1eecf18
commit a1f5c14
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/github.com/getlantern/flashlight/config/resources.go b/src/github.com/getlantern/flashlight/config/resources.go
diff --git a/src/github.com/getlantern/flashlight/genconfig/lantern.yaml b/src/github.com/getlantern/flashlight/genconfig/lantern.yaml
@@ -5,14 +5,6 @@ client:
   proxiedconnectports: [80, 443, 8080, 8443, 5222, 5223, 5224, 5228, 5229, 7300, 19305, 19306, 19307, 19308, 19309]
   frontedservers: []
   chainedservers: 
-    fallback-45.32.60.31:443:
-      addr: 45.32.60.31:443
-      cert: "-----BEGIN CERTIFICATE-----\nMIIDajCCAlKgAwIBAgIEcE0NaTANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJVUzERMA8GA1UE\nCBMITmV3IFlvcmsxFDASBgNVBAcTC1BhcGVyaGFuZ2VyMQwwCgYDVQQKEwNTYXAxFzAVBgNVBAMT\nDkFjaGVzb24gU3VtbmVyMB4XDTE2MDIwNTAzMzQzMVoXDTE3MDIwNDAzMzQzMVowXTELMAkGA1UE\nBhMCVVMxETAPBgNVBAgTCE5ldyBZb3JrMRQwEgYDVQQHEwtQYXBlcmhhbmdlcjEMMAoGA1UEChMD\nU2FwMRcwFQYDVQQDEw5BY2hlc29uIFN1bW5lcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC\nggEBAJ5gctRReKPxkRWcBuVkQoP/oxfiwktEh8xM8ygH+dlAUOmGWJ2IgFUXErCc2zll7UP/m459\nTK9PNZkXSvP2u+x22O5fB5Z3mktNtpO8WbHtq/C908W7Qd12gEd4PJ19nUWWG8/SwgUMN1tnHm8h\nG7GB8pADpQNm+Us0QBwYea7ZgJe7AjUCCh4wcieTpJUN5u72eZFhWNp2Tye6Fh58SrE4OLVRryJs\n14Eh9e9l2LHQgB8YAlBWgcGyQ1gWT7ExWhP3vqbJPiRzGED7KHeiqFYt1LL++VXaGyet+3GKbYR1\nHwkbZC9EsGt/eBh5EwilQ4Q5q92F1Hg1TQjaRvGxTIcCAwEAAaMyMDAwDwYDVR0RBAgwBocELSA8\nHzAdBgNVHQ4EFgQUmgI+FLEQE/rTSiHl+WaclINU4vAwDQYJKoZIhvcNAQELBQADggEBAHlrTI0D\nf5bCgltsBZbVHFr1BJGseORyhI4gJTJRVTpv5W4/QmE+GvWxUQi3k5Vrv6MHE/VZJXDmWNCxB75i\nRk0OIjC4NVVk77bnWjVvSn10RGwzvZurAstVeiQoMgoHfeKHi26th/JVvMAcVln7BSjaBHveIp25\nfQNFMkdmggwEEO96idkp3yQi0D0bBx2S+noUj0T5MbMhml1ixe8L11fsnZDxRftlrqgeHvLAjKyD\n5DfTUWBlXKewztcXqYzzdH2SRmYkL8LtCKoRz1nUKBDbQsY+bqxsMvEE0ZI6432bboBNTybXteiG\nGa5UmYKETnRCsxabZBx6kr668jMgMy8=\n-----END CERTIFICATE-----"
-      authtoken: "Dhidw0Bb3AuxVoGumctTDFnMPolyfyEq4qo05l3VQosVO759UtUlwlFKeGV13cIH"
-      pipelined: true
-      weight: 1000000
-      qos: 10
-      trusted: true
     fallback-45.55.184.76:443:
       addr: 45.55.184.76:443
       cert: "-----BEGIN CERTIFICATE-----\nMIIDjDCCAnSgAwIBAgIEOX7jLzANBgkqhkiG9w0BAQsFADBuMQswCQYDVQQGEwJVUzETMBEGA1UE\nCBMKQ2FsaWZvcm5pYTETMBEGA1UEBxMKU2FjZXJkb3RhbDEcMBoGA1UEChMTU2NhdHRlcmJyYWlu\nIExpbXBlZDEXMBUGA1UEAxMOUmV0cmVhdCBJZGlvdHMwHhcNMTYwMjEzMTEzNzM1WhcNMTgwMjEy\nMTEzNzM1WjBuMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTETMBEGA1UEBxMKU2Fj\nZXJkb3RhbDEcMBoGA1UEChMTU2NhdHRlcmJyYWluIExpbXBlZDEXMBUGA1UEAxMOUmV0cmVhdCBJ\nZGlvdHMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJoQxf5Nd2gR0gu2+w6Z0yhNtS\nsnU8xd9xtDyy4lBz2sw54O5svzk871rDvcmhtj2HLvb7cNMxabROKz8SXQ1LmyYwaNlrGOpxM3RK\nHvTLN1gP08L3Hii+qol+TTmve/1vMlk1T/EN23Rn44PN0ph9dJM96XH91fMWidx/OstV9coknhXZ\nzxBF0wuvsehAadgBQBptRKBOJ/xUCe+0AQcK/d54vfthyCwm7Hm0I9uv8fr5Xgrc1UOfeVU8RBjD\nRCfPoSHi146S0nkU7zOIJG6XKgzR8P3Nu1x+UgO5SNipzmshHAsXWCf1CCTV21Zatpm2CpYc6BrY\n84nGHjTANfk7AgMBAAGjMjAwMA8GA1UdEQQIMAaHBC03uEwwHQYDVR0OBBYEFI7COozzGGK09T6f\nCfT/jUMHBDmrMA0GCSqGSIb3DQEBCwUAA4IBAQCnWN2I3oRH3UqY2ubO4RBEtx2LsSPNaK3mlFuV\n+ev9rH3QWg0DRjvnKwaIMBmpFP4vlgQy1eF3RInL4dy9HzqkaW+/9z6LX+DD8WZiYZ5LqI2J6cVs\nKskqAXrQANJcoPj2An+3oXhtMpKEfgTjSprDSS61fdpqTF2nqiIDMRCruxXh36ImHYdE5rdBQD4Q\n4a5ETWKhaX8V9au2DRQboJVWB/mgNe/+Vqm4x96bLVEQC4sUx0mrnA4A59dOGxH/qt+4zCA1+H36\nWuFKtZAjJJ2UD34Tr1UgOAZx2Sao9ry/jWqTih3b5XF2LLwUx2aFhxLEF5kCeroNKpTyeCDMriLp\n-----END CERTIFICATE-----\n"