Commit 0c364851 authored by Richard Pospesel's avatar Richard Pospesel
Browse files

Removed Webtunnel and Conjure PTs as they are alpha only for now

parent 1472747b

projects/browser/Bundle-Data/PTConfigs/linux/torrc-defaults-appendix

+0 −6
Original line number Diff line number Diff line
@@ -3,9 +3,3 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ./TorBrowser 


## snowflake configuration

ClientTransportPlugin snowflake exec ./TorBrowser/Tor/PluggableTransports/snowflake-client
 


## webtunnel configuration

ClientTransportPlugin webtunnel exec ./TorBrowser/Tor/PluggableTransports/webtunnel-client



## conjure configuration

ClientTransportPlugin conjure exec ./TorBrowser/Tor/PluggableTransports/conjure-client -registerURL https://registration.refraction.network/api

projects/browser/Bundle-Data/PTConfigs/mac/torrc-defaults-appendix

+0 −6
Original line number Diff line number Diff line
@@ -3,9 +3,3 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec PluggableTra 


## snowflake configuration

ClientTransportPlugin snowflake exec PluggableTransports/snowflake-client
 


## webtunnel configuration

ClientTransportPlugin webtunnel exec PluggableTransports/webtunnel-client



## conjure configuration

ClientTransportPlugin conjure exec PluggableTransports/conjure-client -registerURL https://registration.refraction.network/api

projects/browser/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix

+0 −6
Original line number Diff line number Diff line
@@ -3,9 +3,3 @@ ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\T 


## snowflake configuration

ClientTransportPlugin snowflake exec TorBrowser\Tor\PluggableTransports\snowflake-client.exe
 


## webtunnel configuration

ClientTransportPlugin webtunnel exec TorBrowser\Tor\PluggableTransports\webtunnel-client.exe



## conjure configuration

ClientTransportPlugin conjure exec TorBrowser\Tor\PluggableTransports\conjure-client.exe -registerURL https://registration.refraction.network/api

projects/browser/build

+0 −4
Original line number Diff line number Diff line
@@ -109,11 +109,7 @@ mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b 
  # Move READMEs from tor-expert-bundle to the doc dir

  mkdir -p "$TBDIR/$DOCSPATH/snowflake" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/snowflake"[% END %]



  mkdir -p "$TBDIR/$DOCSPATH/webtunnel" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/webtunnel"[% END %]

  mkdir -p "$TBDIR/$DOCSPATH/conjure" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$DOCSPATH/conjure"[% END %]

  mv_tbdir tor/pluggable_transports/README.SNOWFLAKE.md "$DOCSPATH/snowflake/README.md"

  mv_tbdir tor/pluggable_transports/README.WEBTUNNEL.md "$DOCSPATH/webtunnel/README.md"

  mv_tbdir tor/pluggable_transports/README.CONJURE.md "$DOCSPATH/conjure/README.md"



  # Move the PTs to where TB expects them

  mkdir -p "$TBDIR/$TORBINPATH" [% IF c("var/macos_universal") %]"$TBDIR_AARCH64/$TORBINPATH"[% END %]

projects/tor-android-service/config

+1 −1
Original line number Diff line number Diff line 
# vim: filetype=yaml sw=2

version: '[% c("abbrev") %]'

filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]'

git_hash: 0438a9a4ce1548be08dd2df891a38987bb313d22

git_hash: f324999c1773a8d8c83c50106a2cac30be93aabf

git_url: https://gitlab.torproject.org/tpo/applications/tor-android-service.git

git_submodule: 1

container: