Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build

Commits:

3 changed files:

Changes:

  • projects/tor-expert-bundle/build
    ... ... @@ -17,6 +17,9 @@ mv $rootdir/bridges_list.obfs4.txt .
    17 17
     mv $rootdir/bridges_list.meek-azure.txt .
    
    18 18
     mv $rootdir/bridges_list.snowflake.txt .
    
    19 19
     
    
    20
    +# add per-platform pt extension
    
    21
    +awk '{gsub(/\$\{pt_extension\}/, "[% c("var/pt_extension") %]"); print}' $rootdir/pt_config.json > pt_config.json
    
    22
    +
    
    20 23
     cd $distdir
    
    21 24
     [%
    
    22 25
       SET tar_src = [ "tor", "data" ];
    

  • projects/tor-expert-bundle/config
    ... ... @@ -5,6 +5,11 @@ version: '[% c("var/torbrowser_version") %]'
    5 5
     container:
    
    6 6
       use_container: 1
    
    7 7
     
    
    8
    +targets:
    
    9
    +  windows:
    
    10
    +    var:
    
    11
    +      pt_extension: .exe
    
    12
    +
    
    8 13
     input_files:
    
    9 14
       - project: container-image
    
    10 15
       - name: tor
    
    ... ... @@ -13,6 +18,7 @@ input_files:
    13 18
         project: obfs4
    
    14 19
       - name: snowflake
    
    15 20
         project: snowflake
    
    21
    +  - filename: pt_config.json
    
    16 22
       - filename: bridges_list.obfs4.txt
    
    17 23
       - filename: bridges_list.meek-azure.txt
    
    18 24
       - filename: bridges_list.snowflake.txt

  • projects/tor-expert-bundle/pt_config.json
    1
    +{
    
    2
    +  "recommendedDefault" : "obfs4",
    
    3
    +  "pluggableTransports" : {
    
    4
    +    "obfs4proxy" : "ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ${pt_path}obfs4proxy${pt_extension}",
    
    5
    +    "snowflake" : "ClientTransportPlugin snowflake exec ${pt_path}snowflake-client${pt_extension}"
    
    6
    +  },
    
    7
    +  "bridges" : {
    
    8
    +    "meek-azure" : [
    
    9
    +      "meek_lite 192.0.2.18:80 BE776A53492E1E044A26F17306E1BC46A55A1625 url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com"
    
    10
    +    ],
    
    11
    +    "obfs4" : [
    
    12
    +      "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1",
    
    13
    +      "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0",
    
    14
    +      "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0",
    
    15
    +      "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0",
    
    16
    +      "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0",
    
    17
    +      "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0",
    
    18
    +      "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0",
    
    19
    +      "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0",
    
    20
    +      "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0",
    
    21
    +      "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0",
    
    22
    +      "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0"
    
    23
    +    ],
    
    24
    +    "snowflake" : [
    
    25
    +      "snowflake 192.0.2.3:80 2B280B23E1107BB62ABFC40DDCC8824814F80A72 fingerprint=2B280B23E1107BB62ABFC40DDCC8824814F80A72 url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.com:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn",
    
    26
    +      "snowflake 192.0.2.4:80 8838024498816A039FCBBAB14E6F40A0843051FA fingerprint=8838024498816A039FCBBAB14E6F40A0843051FA url=https://snowflake-broker.torproject.net.global.prod.fastly.net/ front=cdn.sstatic.net ice=stun:stun.l.google.com:19302,stun:stun.antisip.com:3478,stun:stun.bluesip.net:3478,stun:stun.dus.net:3478,stun:stun.epygi.com:3478,stun:stun.sonetel.net:3478,stun:stun.uls.co.za:3478,stun:stun.voipgate.com:3478,stun:stun.voys.nl:3478 utls-imitate=hellorandomizedalpn"
    
    27
    +    ]
    
    28
    +  }
    
    29
    +}
    
    30
    +