commit 2485b30f4fa03a2acfc3c89e3933fec0805ebca8 Author: David Fifield david@bamsoftware.com Date: Sun Jan 12 08:19:49 2014 -0800
Move PT config into separate torrc-appendix files. --- Bundle-Data/beta/linux/torrc-defaults-appendix | 33 +++++++++++++++++++++ Bundle-Data/beta/mac/torrc-defaults-appendix | 33 +++++++++++++++++++++ Bundle-Data/beta/windows/torrc-defaults-appendix | 33 +++++++++++++++++++++ Bundle-Data/linux/Data/Tor/torrc-defaults | 34 ---------------------- Bundle-Data/mac/Data/Tor/torrc-defaults | 34 ---------------------- Bundle-Data/windows/Data/Tor/torrc-defaults | 34 ---------------------- gitian/descriptors/linux/gitian-bundle.yml | 2 ++ gitian/descriptors/mac/gitian-bundle.yml | 2 ++ gitian/descriptors/windows/gitian-bundle.yml | 2 ++ gitian/mkbundle-linux.sh | 1 + gitian/mkbundle-mac.sh | 1 + gitian/mkbundle-windows.sh | 1 + 12 files changed, 108 insertions(+), 102 deletions(-)
diff --git a/Bundle-Data/beta/linux/torrc-defaults-appendix b/Bundle-Data/beta/linux/torrc-defaults-appendix new file mode 100644 index 0000000..2274863 --- /dev/null +++ b/Bundle-Data/beta/linux/torrc-defaults-appendix @@ -0,0 +1,33 @@ + +## obfsproxy configuration +# +# Bridge obfs3 83.212.101.2:42782 +# Bridge obfs3 83.212.101.2:443 +# Bridge obfs3 169.229.59.75:46328 +# Bridge obfs3 169.229.59.74:31493 +# Bridge obfs3 209.141.36.236:45496 +# Bridge obfs3 208.79.90.242:35658 +# Bridge obfs3 109.105.109.163:38980 +# Bridge obfs3 109.105.109.163:47779 +# +# Bridge obfs2 83.212.100.216:47870 +# Bridge obfs2 83.212.96.182:46602 +# Bridge obfs2 70.182.182.109:54542 +# Bridge obfs2 128.31.0.34:1051 +# Bridge obfs2 83.212.101.2:45235 + +ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed + + +## flash proxy configuration +# +# LearnCircuitBuildTimeout 0 +# CircuitBuildTimeout 60 +# +# # The flashproxy bridge address and port are ignored. +# Bridge flashproxy 0.0.1.0:1 + +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/mac/torrc-defaults-appendix b/Bundle-Data/beta/mac/torrc-defaults-appendix new file mode 100644 index 0000000..b711e60 --- /dev/null +++ b/Bundle-Data/beta/mac/torrc-defaults-appendix @@ -0,0 +1,33 @@ + +## obfsproxy configuration +# +# Bridge obfs3 83.212.101.2:42782 +# Bridge obfs3 83.212.101.2:443 +# Bridge obfs3 169.229.59.75:46328 +# Bridge obfs3 169.229.59.74:31493 +# Bridge obfs3 209.141.36.236:45496 +# Bridge obfs3 208.79.90.242:35658 +# Bridge obfs3 109.105.109.163:38980 +# Bridge obfs3 109.105.109.163:47779 +# +# Bridge obfs2 83.212.100.216:47870 +# Bridge obfs2 83.212.96.182:46602 +# Bridge obfs2 70.182.182.109:54542 +# Bridge obfs2 128.31.0.34:1051 +# Bridge obfs2 83.212.101.2:45235 + +ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed + + +## flash proxy configuration +# +# LearnCircuitBuildTimeout 0 +# CircuitBuildTimeout 60 +# +# # The flashproxy bridge address and port are ignored. +# Bridge flashproxy 0.0.1.0:1 + +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/beta/windows/torrc-defaults-appendix b/Bundle-Data/beta/windows/torrc-defaults-appendix new file mode 100644 index 0000000..0fad86d --- /dev/null +++ b/Bundle-Data/beta/windows/torrc-defaults-appendix @@ -0,0 +1,33 @@ + +## obfsproxy configuration +# +# Bridge obfs3 83.212.101.2:42782 +# Bridge obfs3 83.212.101.2:443 +# Bridge obfs3 169.229.59.75:46328 +# Bridge obfs3 169.229.59.74:31493 +# Bridge obfs3 209.141.36.236:45496 +# Bridge obfs3 208.79.90.242:35658 +# Bridge obfs3 109.105.109.163:38980 +# Bridge obfs3 109.105.109.163:47779 +# +# Bridge obfs2 83.212.100.216:47870 +# Bridge obfs2 83.212.96.182:46602 +# Bridge obfs2 70.182.182.109:54542 +# Bridge obfs2 128.31.0.34:1051 +# Bridge obfs2 83.212.101.2:45235 + +ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed + + +## flash proxy configuration +# +# LearnCircuitBuildTimeout 0 +# CircuitBuildTimeout 60 +# +# # The flashproxy bridge address and port are ignored. +# Bridge flashproxy 0.0.1.0:1 + +# Change the second number here (9000) to the number of a port that can +# receive connections from the Internet (the port for which you +# configured port forwarding). +ClientTransportPlugin flashproxy exec Tor\PluggableTransports\flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/linux/Data/Tor/torrc-defaults b/Bundle-Data/linux/Data/Tor/torrc-defaults index afa9793..819b9e8 100644 --- a/Bundle-Data/linux/Data/Tor/torrc-defaults +++ b/Bundle-Data/linux/Data/Tor/torrc-defaults @@ -8,37 +8,3 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 - - -## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 -# Bridge obfs3 83.212.101.2:443 -# Bridge obfs3 169.229.59.75:46328 -# Bridge obfs3 169.229.59.74:31493 -# Bridge obfs3 209.141.36.236:45496 -# Bridge obfs3 208.79.90.242:35658 -# Bridge obfs3 109.105.109.163:38980 -# Bridge obfs3 109.105.109.163:47779 -# -# Bridge obfs2 83.212.100.216:47870 -# Bridge obfs2 83.212.96.182:46602 -# Bridge obfs2 70.182.182.109:54542 -# Bridge obfs2 128.31.0.34:1051 -# Bridge obfs2 83.212.101.2:45235 - -ClientTransportPlugin obfs2,obfs3 exec ./Tor/PluggableTransports/obfsproxy.bin managed - - -## flash proxy configuration -# -# LearnCircuitBuildTimeout 0 -# CircuitBuildTimeout 60 -# -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec ./Tor/PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/mac/Data/Tor/torrc-defaults b/Bundle-Data/mac/Data/Tor/torrc-defaults index efcba98..819b9e8 100644 --- a/Bundle-Data/mac/Data/Tor/torrc-defaults +++ b/Bundle-Data/mac/Data/Tor/torrc-defaults @@ -8,37 +8,3 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 - - -## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 -# Bridge obfs3 83.212.101.2:443 -# Bridge obfs3 169.229.59.75:46328 -# Bridge obfs3 169.229.59.74:31493 -# Bridge obfs3 209.141.36.236:45496 -# Bridge obfs3 208.79.90.242:35658 -# Bridge obfs3 109.105.109.163:38980 -# Bridge obfs3 109.105.109.163:47779 -# -# Bridge obfs2 83.212.100.216:47870 -# Bridge obfs2 83.212.96.182:46602 -# Bridge obfs2 70.182.182.109:54542 -# Bridge obfs2 128.31.0.34:1051 -# Bridge obfs2 83.212.101.2:45235 - -ClientTransportPlugin obfs2,obfs3 exec PluggableTransports/obfsproxy.bin managed - - -## flash proxy configuration -# -# LearnCircuitBuildTimeout 0 -# CircuitBuildTimeout 60 -# -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec PluggableTransports/flashproxy-client --register :0 :9000 diff --git a/Bundle-Data/windows/Data/Tor/torrc-defaults b/Bundle-Data/windows/Data/Tor/torrc-defaults index 58fa47d..819b9e8 100644 --- a/Bundle-Data/windows/Data/Tor/torrc-defaults +++ b/Bundle-Data/windows/Data/Tor/torrc-defaults @@ -8,37 +8,3 @@ Log notice stdout SocksPort 9150 ControlPort 9151 CookieAuthentication 1 - - -## obfsproxy configuration -# -# Bridge obfs3 83.212.101.2:42782 -# Bridge obfs3 83.212.101.2:443 -# Bridge obfs3 169.229.59.75:46328 -# Bridge obfs3 169.229.59.74:31493 -# Bridge obfs3 209.141.36.236:45496 -# Bridge obfs3 208.79.90.242:35658 -# Bridge obfs3 109.105.109.163:38980 -# Bridge obfs3 109.105.109.163:47779 -# -# Bridge obfs2 83.212.100.216:47870 -# Bridge obfs2 83.212.96.182:46602 -# Bridge obfs2 70.182.182.109:54542 -# Bridge obfs2 128.31.0.34:1051 -# Bridge obfs2 83.212.101.2:45235 - -ClientTransportPlugin obfs2,obfs3 exec Tor\PluggableTransports\obfsproxy managed - - -## flash proxy configuration -# -# LearnCircuitBuildTimeout 0 -# CircuitBuildTimeout 60 -# -# # The flashproxy bridge address and port are ignored. -# Bridge flashproxy 0.0.1.0:1 - -# Change the second number here (9000) to the number of a port that can -# receive connections from the Internet (the port for which you -# configured port forwarding). -ClientTransportPlugin flashproxy exec Tor\PluggableTransports\flashproxy-client --register :0 :9000 diff --git a/gitian/descriptors/linux/gitian-bundle.yml b/gitian/descriptors/linux/gitian-bundle.yml index 7d5cac3..4d25eb7 100644 --- a/gitian/descriptors/linux/gitian-bundle.yml +++ b/gitian/descriptors/linux/gitian-bundle.yml @@ -30,6 +30,7 @@ files: - "tor-linux64-gbuilt.zip" - "pluggable-transports-linux32-gbuilt.zip" - "pluggable-transports-linux64-gbuilt.zip" +- "torrc-defaults-appendix-linux" - "relativelink-src.zip" - "linux-skeleton.zip" - "linux-langpacks.zip" @@ -103,6 +104,7 @@ script: | unzip ~/build/pluggable-transports-linux$GBUILD_BITS-gbuilt.zip unzip ~/build/linux-skeleton.zip unzip ~/build/tbb-docs.zip + cat ~/build/torrc-defaults-appendix-linux >> Data/Tor/torrc-defaults chmod 700 Data/Browser chmod 700 Data/Tor cd .. diff --git a/gitian/descriptors/mac/gitian-bundle.yml b/gitian/descriptors/mac/gitian-bundle.yml index b06ebf7..5ae6997 100644 --- a/gitian/descriptors/mac/gitian-bundle.yml +++ b/gitian/descriptors/mac/gitian-bundle.yml @@ -25,6 +25,7 @@ files: - "tor-browser-mac32-gbuilt.zip" - "tor-mac32-gbuilt.zip" - "pluggable-transports-mac32-gbuilt.zip" +- "torrc-defaults-appendix-mac" - "relativelink-src.zip" - "mac-skeleton.zip" - "mac-langpacks.zip" @@ -102,6 +103,7 @@ script: | cd TorBrowserBundle.app unzip ~/build/mac-skeleton.zip unzip ~/build/tbb-docs.zip + cat ~/build/torrc-defaults-appendix-mac >> Data/Tor/torrc-defaults # Install a "tor" shim that sets the working directory. See #10030. mv Tor/tor Tor/tor.real cp ~/build/mac-tor.sh Tor/tor diff --git a/gitian/descriptors/windows/gitian-bundle.yml b/gitian/descriptors/windows/gitian-bundle.yml index a96985c..393d5d8 100644 --- a/gitian/descriptors/windows/gitian-bundle.yml +++ b/gitian/descriptors/windows/gitian-bundle.yml @@ -27,6 +27,7 @@ files: - "tor-browser-win32-gbuilt.zip" - "tor-win32-gbuilt.zip" - "pluggable-transports-win32-gbuilt.zip" +- "torrc-defaults-appendix-windows" - "relativelink-src.zip" - "windows-skeleton.zip" - "win32-langpacks.zip" @@ -105,6 +106,7 @@ script: | unzip ~/build/pluggable-transports-win32-gbuilt.zip unzip ~/build/windows-skeleton.zip unzip ~/build/tbb-docs.zip + cat ~/build/torrc-defaults-appendix-windows >> Data/Tor/torrc-defaults cd .. # # Copy reproducibility info diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index 37788f8..4232cf7 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -51,6 +51,7 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ +cp beta/linux/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-linux
cd linux rm -f $GITIAN_DIR/inputs/linux-skeleton.zip diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 772dd84..f990d3c 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -51,6 +51,7 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ +cp beta/mac/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-mac cp mac-tor.sh $GITIAN_DIR/inputs/
cd mac diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index fbc6668..d45ec51 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -53,6 +53,7 @@ $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/relativelink-src.zip ./Rel cd ./Bundle-Data/ rm -f $GITIAN_DIR/inputs/tbb-docs.zip $WRAPPER_DIR/build-helpers/dzip.sh $GITIAN_DIR/inputs/tbb-docs.zip ./Docs/ +cp beta/windows/torrc-defaults-appendix $GITIAN_DIR/inputs/torrc-defaults-appendix-windows
cd windows rm -f $GITIAN_DIR/inputs/windows-skeleton.zip