Add another source for AntiZapret. Add AZ proxy for twitter to block-informer. Replace some rebrand.ly links (blocked on TSPU)

extensions/chromium/runet-censorship-bypass/src/extension-common/37-sync-pac-script-with-pac-provider-api.tmpl.js

@@ -138,7 +138,6 @@
 
       if (err) {
         if (err.message === 'proxy.settings requires private browsing permission.') {
-          // window.utils.openAndFocus('https://rebrand.ly/ac-allow-private-windows');
           clarifyThen(
             chrome.i18n.getMessage('AllowExtensionToRunInPrivateWindows'),
             cb,
@@ -277,6 +276,8 @@
         order: 0,
         pacUrls: [
           'https://antizapret.prostovpn.org:8443/proxy.pac',
+          'https://antizapret.prostovpn.org:18443/proxy.pac',
+          'https://antizapret.prostovpn.org/proxy.pac',
           'https://rebrand.ly/ac-antizapret-pac',
         ],
       },
@@ -678,9 +679,13 @@
 
       console.log('Updating from', oldAntiCensorRu.version, 'to', antiCensorRu.version);
       try {
-        if (window.apis.version.isLeq(oldAntiCensorRu.version, '0.0.1.56')) {
+        if (window.apis.version.isLeq(oldAntiCensorRu.version, '0.0.1.57')) {
-          window.apis.antiCensorRu.pacProviders['Антизапрет'].pacUrls[0] = 'https://antizapret.prostovpn.org:8443/proxy.pac';
+          const azWithPort = 'https://antizapret.prostovpn.org:8443/proxy.pac';
-          console.log('Successfully updated to 0.0.1.57.');
+          const azWithPortAlt = 'https://antizapret.prostovpn.org:18443/proxy.pac';
+          const urls = window.apis.antiCensorRu.pacProviders['Антизапрет'].pacUrls;
+          urls[0] = 'https://antizapret.prostovpn.org/proxy.pac';
+          urls.unshift(azWithPort, azWithPortAlt);
+          console.log('Successfully updated to 0.0.1.58.');
         }
       } catch (e) {
         // Log update error.

extensions/chromium/runet-censorship-bypass/src/extension-common/pages/troubleshoot/index.html

@@ -10,12 +10,12 @@
     <ol>
       <li><a data-in-bg="false" href class="view-errors">Детали последних ошибок</a></li>
       <li><a data-in-bg="false" href class="reset-settings">Сбросить настройки</a></li>
-      <li><a data-in-bg="false" href="https://rebrand.ly/ac-support" target="_blank">Файл самопомощи</a></li>
+      <li><a data-in-bg="false" href="https://github.com/anticensority/runet-censorship-bypass/wiki/Если-расширение-не-работает" target="_blank">Файл самопомощи</a></li>
-      <li><a data-in-bg="false" href="https://rebrand.ly/ac-contact">Напишите нам!</a></li>
+      <li><a data-in-bg="false" href="https://groups.google.com/g/anticensority">Напишите нам!</a></li>
     </ol>
     <h2>Для продвинутых</h2>
     <ol>
-      <li><a data-in-bg="false" href="https://rebrand.ly/ac-logs">Как прочитать логи?</a></li>
+      <li><a data-in-bg="false" href="https://github.com/anticensority/runet-censorship-bypass/wiki/Как-прочитать-логи%3F-%28для-продвинутых%29">Как прочитать логи?</a></li>
       <li><a data-in-bg="false" href="../debug/index.html">Отладка PAC-скрипта</a></li>
     </ol>
     <hr/>
@@ -23,12 +23,12 @@
     <ol>
       <li><a data-in-bg="false" href class="view-errors">Details of last errors</a></li>
       <li><a data-in-bg="false" href class="reset-settings">Reset settings</a></li>
-      <li><a data-in-bg="false" href="https://rebrand.ly/ac-support" target="_blank">Troubleshoot guide (ru)</a></li>
+      <li><a data-in-bg="false" href="https://github.com/anticensority/runet-censorship-bypass/wiki/Если-расширение-не-работает" target="_blank">Troubleshoot guide (ru)</a></li>
-      <li><a data-in-bg="false" href="https://rebrand.ly/ac-contact">Write to us!</a></li>
+      <li><a data-in-bg="false" href="https://groups.google.com/g/anticensority">Write to us!</a></li>
     </ol>
     <h2>Advanced</h2>
     <ol>
-      <li><a data-in-bg="false" href="https://rebrand.ly/ac-logs">How to read logs?</a></li>
+      <li><a data-in-bg="false" href="https://github.com/anticensority/runet-censorship-bypass/wiki/Как-прочитать-логи%3F-%28для-продвинутых%29">How to read logs?</a></li>
       <li><a data-in-bg="false" href="../debug/index.html">PAC-script debugging</a></li>
     </ol>
     <script src="./index.js"></script>

extensions/chromium/runet-censorship-bypass/src/extension-full/20-ip-to-host-api.js

@@ -75,6 +75,7 @@
       'proxy.antizapret.prostovpn.org',
       'proxy-ssl.antizapret.prostovpn.org',
       'proxy-nossl.antizapret.prostovpn.org',
+      'proxy-fbtw-ssl.antizapret.prostovpn.org',
     ].reduce((acc, hostname) => Object.assign(acc, { [hostname]: { host: hostname }}), {
       // Defaults:
       localhost: { host: 'localhost' },