Ticket #8589: pt_download.patch

File pt_download.patch, 7.1 KB (added by asn, 7 years ago)
  • download/en/download.wml

    commit 52571ed501b78a58b8fcdb84afea59f60ef5e771
    Author: George Kadianakis <desnacked@riseup.net>
    Date:   Mon Mar 25 20:46:46 2013 -0700
    
        Add Pluggable Transport Bundles to the downloads page.
    
    diff --git a/download/en/download.wml b/download/en/download.wml
    index 86c2a62..f5dd81c 100644
    a b you are used to. Please read the <a href="#warning">full list of warnings</a> fo 
    5757          <em>Version <version-torbrowserbundle> - Windows 8, 7, Vista, and XP</em>
    5858          <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
    5959        </div>
     60<!-- PT BUNDLE -->
     61        <div class="package">
     62          <div class="downloads">
     63            <a class="button" href="<package-obfs-windows-alpha>"><span class="strong">Download</span><span class="normal">Pluggable Transport Bundle</span></a>
     64            <div class="sig">
     65              (<a href="<package-obfs-windows-alpha>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
     66            </div>
     67          </div>
     68    <h2>Pluggable Transport Bundles (alpha)</h2>
     69    <em>Version <version-torobfsbundlealpha> - Windows 8, 7, Vista, and XP</em>
     70    <p>
     71      Pluggable Transport Bundles are special bundles used for
     72      <em>censorship circumventation</em>. With the use of
     73      <a href="<page docs/bridges>">Tor bridges</a>,
     74      and
     75      <a href="<page docs/pluggable-transports>">pluggable transports</a>
     76      these bundles are harder to block than normal Tor Browser Bundles.
     77      Don't forget to
     78      <a href="https://bridges.torproject.org">use BridgeDB</a>
     79      to get some fresh bridges.
     80    </p>
     81        </div>
    6082<!-- VIDALIA BRIDGE BUNDLE -->
    6183        <div class="package">
    6284          <div class="downloads">
    you are used to. Please read the <a href="#warning">full list of warnings</a> fo 
    144166<!--        <a class="additional" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip">Download Unstable</a> (<a href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx32alpha>-osx-i386-en-US.zip.asc">sig</a>)-->
    145167          </form>
    146168
    147           <h2>Tor Browser Bundle</h2>
     169     <h2>Tor Browser Bundle</h2>
    148170          <em>Version <version-torbrowserbundleosx32> - OS X Intel</em>
    149171          <p>Everything you need to safely browse the Internet. This package requires no installation. Just extract it and run. <a href="<page projects/torbrowser>">Learn more &raquo;</a></p>
    150172        </div>
     173
     174
     175  <!-- PT BUNDLE -->
     176  <div class="package">
     177    <div class="downloads">
     178      <a class="button osx-tbb" href="<package-obfs-mac-alpha>"><span class="strong">Download</span><span class="normal">Pluggable Transport Bundle</span></a>
     179      <div class="sig">
     180        (<a class="osx-tbb-sig" href="<package-obfs-mac-alpha>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
     181      </div>
     182    </div>
     183
     184    <h2>Pluggable Transport Bundles (alpha)</h2>
     185    <em>Version <version-torobfsbundleosx32alpha> - OS X Intel</em>
     186    <p>
     187      Pluggable Transport Bundles are special bundles used for
     188      <em>censorship circumventation</em>. With the use of
     189      <a href="<page docs/bridges>">Tor bridges</a>,
     190      and
     191      <a href="<page docs/pluggable-transports>">pluggable transports</a>
     192      these bundles are harder to block than normal Tor Browser Bundles.
     193      Don't forget to
     194      <a href="https://bridges.torproject.org">use BridgeDB</a>
     195      to get some fresh bridges.
     196    </p>
     197    </div>
    151198  </div>
    152199 <!-- END OS X -->
    153200 <!-- START UNIX -->
    you are used to. Please read the <a href="#warning">full list of warnings</a> fo 
    186233          <p>Everything you need to safely browse the Internet. This
    187234package requires no installation. Just extract it and run. <a
    188235href="<page projects/torbrowser>">Learn more &raquo;</a></p>
     236</div>
     237
     238<!-- PT BUNDLES -->
     239<div class="package">
     240          <div class="downloads">
     241            <a class="button lin-tbb32" href="<package-obfs-linux-i686-alpha>"><span class="strong">Download</span><span class="normal">32-bit Pluggable Transport Bundle</span></a>
     242            <div class="sig">
     243              (<a class="lin-tbb32-sig" href="<package-obfs-linux-i686-alpha>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
     244            </div>
     245
     246            <a class="button lin-tbb64" href="<package-obfs-linux-x64-alpha>"><span class="strong">Download</span><span class="normal">64-bit Pluggable Transport Bundle</span></a>
     247            <div class="sig">
     248              (<a class="lin-tbb64-sig" href="<package-obfs-linux-x64-alpha>.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a>
     249            </div>
     250          </div>
     251
     252    <h2>Pluggable Transport Bundles</h2>
     253    <em>Version <version-torobfsbundlelinux32alpha> - Linux, BSD, and Unix</em>
     254    <p>
     255      Pluggable Transport Bundles are special bundles used for
     256      <em>censorship circumventation</em>. With the use of
     257      <a href="<page docs/bridges>">Tor bridges</a>,
     258      and
     259      <a href="<page docs/pluggable-transports>">pluggable transports</a>
     260      these bundles are harder to block than normal Tor Browser Bundles.
     261      Don't forget to
     262      <a href="https://bridges.torproject.org">use BridgeDB</a>
     263      to get some fresh bridges.
     264    </p>
     265    </div>
    189266<!-- repo packages -->
    190267        <div class="package" style="border-bottom: 0px;">
    191268          <div class="downloads">
    href="<page download/download-unix>">Tor repositories.</a> 
    196273          <h2>Tor (standalone)</h2>
    197274          <p>Install the Tor components yourself, run a relay, create
    198275custom configurations. All an apt-get or yum install away.</p>
    199         </div>
    200         </div>
    201       </div>
     276</div>
     277</div>
    202278<!-- END UNIX -->
    203279<!-- START SMARTPHONES -->
    204280      <div id="smartphone" class="accordionButton on">
  • include/versions.wmi

    diff --git a/include/versions.wmi b/include/versions.wmi
    index e15df3f..c990985 100644
    a b  
    104104<define-tag package-osx-ppc-stable whitespace=delete>../dist/osx-ppc/Tor-<version-osx-ppc-stable>-ppc-Bundle.dmg</define-tag>
    105105<define-tag package-osx-ppc-alpha whitespace=delete>../dist/osx-ppc/Tor-<version-osx-ppc-alpha>-ppc-Bundle.dmg</define-tag>
    106106
     107<define-tag package-obfs-windows-alpha>../dist/torbrowser/tor-pluggable-transports-browser-<version-torobfsbundlealpha>_en-US.exe</define-tag>
     108<define-tag package-obfs-mac-alpha>../dist/torbrowser/osx/TorBrowser-Pluggable-Transports-<version-torobfsbundleosx32alpha>-osx-i386-en-US.zip</define-tag>
     109<define-tag package-obfs-linux-i686-alpha>../dist/torbrowser/linux/tor-pluggable-transports-browser-gnu-linux-i686-<version-torobfsbundlelinux32alpha>-dev-en-US.tar.gz</define-tag>
     110<define-tag package-obfs-linux-x64-alpha>../dist/torbrowser/linux/tor-pluggable-transports-browser-gnu-linux-x86_64-<version-torobfsbundlelinux64alpha>-dev-en-US.tar.gz</define-tag>
     111
    107112<define-tag file-source-stable whitespace=delete>tor-<version-stable>.tar.gz</define-tag>
    108113<define-tag package-source-stable whitespace=delete>../dist/<file-source-stable></define-tag>
    109114<define-tag file-source-alpha whitespace=delete>tor-<version-alpha>.tar.gz</define-tag>