May 2014 - tor-commits - lists.torproject.org

[tor-browser-bundle/master] Bug 11535: Add txsocksx dependency.
by gk＠torproject.org 08 May '14

08 May '14

commit b83b504594a1de3359aea4afceb80837408bc99f Author: Georg Koppen <gk(a)torproject.org> Date: Thu May 8 09:57:49 2014 +0000 Bug 11535: Add txsocksx dependency. We not only add the txsocksx dependency but Parsley as well as it is needed by txsocksx. We further avoid downloading vcversioner during build time (that is during running the gitian-pluggable-transport build script) pretending we already have it locally. --- .../linux/gitian-pluggable-transports.yml | 23 ++++++++++++++++++++ .../mac/gitian-pluggable-transports.yml | 23 ++++++++++++++++++++ .../windows/gitian-pluggable-transports.yml | 19 ++++++++++++++++ gitian/fetch-inputs.sh | 6 +++-- gitian/mkbundle-linux.sh | 2 +- gitian/mkbundle-mac.sh | 2 +- gitian/mkbundle-windows.sh | 2 +- gitian/verify-tags.sh | 3 ++- gitian/versions.beta | 13 +++++++---- gitian/versions.nightly | 14 +++++++----- 10 files changed, 92 insertions(+), 15 deletions(-) diff --git a/gitian/descriptors/linux/gitian-pluggable-transports.yml b/gitian/descriptors/linux/gitian-pluggable-transports.yml index 4423b50..25109b8 100644 --- a/gitian/descriptors/linux/gitian-pluggable-transports.yml +++ b/gitian/descriptors/linux/gitian-pluggable-transports.yml @@ -25,6 +25,8 @@ remotes: "dir": "flashproxy" - "url": "https://github.com/kpdyer/fteproxy.git" "dir": "fteproxy" +- "url": "https://github.com/habnabit/txsocksx.git" + "dir": "txsocksx" files: - "openssl.tar.gz" - "gmp.tar.bz2" @@ -34,6 +36,7 @@ files: - "zope.interface.zip" - "twisted.tar.bz2" - "m2crypto.tar.gz" +- "parsley.tar.gz" - "dzip.sh" script: | INSTDIR="$HOME/install" @@ -106,6 +109,26 @@ script: | cp -a build/twisted $PTDIR/ cd .. # + tar xzf parsley.tar.gz + cd Parsley-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + $PYTHON setup.py build --build-lib build + cp -a build/parsley.py $PTDIR/ + cp -a build/ometa $PTDIR/ + cp -a build/terml $PTDIR/ + cd .. + # + cd txsocksx + find -type f | xargs touch --date="$REFERENCE_DATETIME" + # Let's pretend we have the setup dependency already as we don't want to get + # it downloaded during building. Just pretending and thus avoiding another + # dependency should be fine here as txsocksx catches the exception due to + # missing __version__ and __sha__ . + mkdir vcversioner-1.14.1.1-py2.6.egg + $PYTHON setup.py build --build-lib build + cp -a build/txsocksx $PTDIR/ + cd .. + # cd obfsproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" $PYTHON setup.py build --build-lib build diff --git a/gitian/descriptors/mac/gitian-pluggable-transports.yml b/gitian/descriptors/mac/gitian-pluggable-transports.yml index 920b231..df73197 100644 --- a/gitian/descriptors/mac/gitian-pluggable-transports.yml +++ b/gitian/descriptors/mac/gitian-pluggable-transports.yml @@ -25,6 +25,8 @@ remotes: "dir": "flashproxy" - "url": "https://github.com/kpdyer/fteproxy.git" "dir": "fteproxy" +- "url": "https://github.com/habnabit/txsocksx.git" + "dir": "txsocksx" files: - "openssl.tar.gz" - "gmp.tar.bz2" @@ -34,6 +36,7 @@ files: - "zope.interface.zip" - "twisted.tar.bz2" - "m2crypto.tar.gz" +- "parsley.tar.gz" - "apple-uni-sdk-10.6_20110407-0.flosoft1_i386.deb" - "multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz" - "dzip.sh" @@ -126,6 +129,26 @@ script: | cp -a build/twisted $PTDIR/ cd .. # + tar xzf parsley.tar.gz + cd Parsley-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + python setup.py build --build-lib build + cp -a build/parsley.py $PTDIR/ + cp -a build/ometa $PTDIR/ + cp -a build/terml $PTDIR/ + cd .. + # + cd txsocksx + find -type f | xargs touch --date="$REFERENCE_DATETIME" + # Let's pretend we have the setup dependency already as we don't want to get + # it downloaded during building. Just pretending and thus avoiding another + # dependency should be fine here as txsocksx catches the exception due to + # missing __version__ and __sha__ . + mkdir vcversioner-1.14.1.1-py2.7.egg + python setup.py build --build-lib build + cp -a build/txsocksx $PTDIR/ + cd .. + # cd obfsproxy find -type f | xargs touch --date="$REFERENCE_DATETIME" python setup.py build --build-lib build diff --git a/gitian/descriptors/windows/gitian-pluggable-transports.yml b/gitian/descriptors/windows/gitian-pluggable-transports.yml index 3624d04..cf7595e 100644 --- a/gitian/descriptors/windows/gitian-pluggable-transports.yml +++ b/gitian/descriptors/windows/gitian-pluggable-transports.yml @@ -26,6 +26,8 @@ remotes: "dir": "flashproxy" - "url": "https://github.com/kpdyer/fteproxy.git" "dir": "fteproxy" +- "url": "https://github.com/habnabit/txsocksx.git" + "dir": "txsocksx" files: - "openssl.tar.gz" - "gmp.tar.bz2" @@ -36,6 +38,7 @@ files: - "zope.interface.zip" - "twisted.tar.bz2" - "m2crypto.tar.gz" +- "parsley.tar.gz" - "ubuntu-wine.gpg" - "wine-wrappers" - "python.msi" @@ -193,6 +196,22 @@ script: | LD_PRELOAD= $INSTPYTHON setup.py install --single-version-externally-managed --record /dev/null cd .. # + tar xzf parsley.tar.gz + cd Parsley-* + find -type f | xargs touch --date="$REFERENCE_DATETIME" + LD_PRELOAD= $INSTPYTHON setup.py install + cd .. + # + cd txsocksx + find -type f | xargs touch --date="$REFERENCE_DATETIME" + # Let's pretend we have the setup dependency already as we don't want to get + # it downloaded during building. Just pretending and thus avoiding another + # dependency should be fine here as txsocksx catches the exception due to + # missing __version__ and __sha__ . + mkdir vcversioner-1.14.1.1-py2.7.egg + LD_PRELOAD= $INSTPYTHON setup.py install + cd .. + # # py2exe byte-compiles to .pyc files, which embed the mtime of the parent .py file. find $INSTDIR/python -type f | xargs touch --date="$REFERENCE_DATETIME" # diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 03827b6..c89d340 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -178,7 +178,7 @@ do get "${!PACKAGE}" "${MIRROR_URL_ASN}${!PACKAGE}" done -for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS +for i in ZOPEINTERFACE TWISTED PY2EXE SETUPTOOLS PARSLEY do URL="${i}_URL" PACKAGE="${i}_PACKAGE" @@ -229,7 +229,7 @@ fi # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" @@ -281,6 +281,7 @@ ln -sf "$PY2EXE_PACKAGE" py2exe.exe ln -sf "$SETUPTOOLS_PACKAGE" setuptools.tar.gz ln -sf "$GMP_PACKAGE" gmp.tar.bz2 ln -sf "$LXML_PACKAGE" lxml.tar.gz +ln -sf "$PARSLEY_PACKAGE" parsley.tar.gz # Fetch latest gitian-builder itself # XXX - this is broken if a non-standard inputs dir is selected using the command line flag. @@ -308,6 +309,7 @@ obfsproxy https://git.torproject.org/pluggable-transports/obfsproxy.git $OBFSPRO flashproxy https://git.torproject.org/flashproxy.git $FLASHPROXY_TAG fteproxy https://github.com/kpdyer/fteproxy.git $FTEPROXY_TAG libdmg-hfsplus https://github.com/vasi/libdmg-hfsplus.git $LIBDMG_TAG +txsocksx https://github.com/habnabit/txsocksx.git $TXSOCKSX_TAG EOF exit 0 diff --git a/gitian/mkbundle-linux.sh b/gitian/mkbundle-linux.sh index fc88092..d6186d2 100755 --- a/gitian/mkbundle-linux.sh +++ b/gitian/mkbundle-linux.sh @@ -204,7 +204,7 @@ then echo "****** Starting Pluggable Transports Component of Linux Bundle (4/5 for Linux) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG $DESCRIPTOR_DIR/linux/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-linux.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-mac.sh b/gitian/mkbundle-mac.sh index 8d3c73e..a7752a9 100755 --- a/gitian/mkbundle-mac.sh +++ b/gitian/mkbundle-mac.sh @@ -148,7 +148,7 @@ then echo "****** Starting Pluggable Transports Component of Mac Bundle (3/4 for Mac) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG $DESCRIPTOR_DIR/mac/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./firefox-fail-mac.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/mkbundle-windows.sh b/gitian/mkbundle-windows.sh index 4a176bf..f93fb57 100755 --- a/gitian/mkbundle-windows.sh +++ b/gitian/mkbundle-windows.sh @@ -143,7 +143,7 @@ then echo "****** Starting Pluggable Transports Component of Windows Bundle (3/4 for Windows) ******" echo - ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml + ./bin/gbuild -j $NUM_PROCS -m $VM_MEMORY --commit pyptlib=$PYPTLIB_TAG,obfsproxy=$OBFSPROXY_TAG,flashproxy=$FLASHPROXY_TAG,fteproxy=$FTEPROXY_TAG,txsocksx=$TXSOCKSX_TAG $DESCRIPTOR_DIR/windows/gitian-pluggable-transports.yml if [ $? -ne 0 ]; then #mv var/build.log ./pluggable-transports-fail-win32.log.`date +%Y%m%d%H%M%S` diff --git a/gitian/verify-tags.sh b/gitian/verify-tags.sh index 8829b9d..e5e9f3f 100755 --- a/gitian/verify-tags.sh +++ b/gitian/verify-tags.sh @@ -107,6 +107,7 @@ while read dir commit; do done << EOF libdmg-hfsplus $LIBDMG_TAG fteproxy $FTEPROXY_TAG +txsocksx $TXSOCKSX_TAG EOF # Verify signatures on signed packages @@ -130,7 +131,7 @@ done # Verify packages with weak or no signatures via direct sha256 check # (OpenSSL is signed with MD5, and OSXSDK is not signed at all) -for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP +for i in OSXSDK TOOLCHAIN4 TOOLCHAIN4_OLD NOSCRIPT HTTPSE MINGW MSVCR100 PYCRYPTO ARGPARSE PYYAML ZOPEINTERFACE TWISTED M2CRYPTO SETUPTOOLS OPENSSL GMP PARSLEY do PACKAGE="${i}_PACKAGE" HASH="${i}_HASH" diff --git a/gitian/versions.beta b/gitian/versions.beta index c3faa7b..d10c87a 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -15,11 +15,12 @@ NSIS_TAG=v0.1 ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 -PYPTLIB_TAG=pyptlib-0.0.5 -OBFSPROXY_TAG=obfsproxy-0.2.4 +PYPTLIB_TAG=pyptlib-0.0.6 +OBFSPROXY_TAG=obfsproxy-0.2.9 FLASHPROXY_TAG=1.6 FTEPROXY_TAG=55d81d2f0a4fab759c1ed8aca78dd3a5db6e75c6 # unsigned 0.2.13 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 +TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 GITIAN_TAG=tor-browser-builder-3.x-5 @@ -33,11 +34,12 @@ PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 -TWISTED_VER=13.1.0 +TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 +PARSLEY_VER=1.2 HTTPSE_VER=3.5.1 ## File names for the source packages @@ -63,6 +65,7 @@ M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz +PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -78,10 +81,11 @@ PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc -TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 +TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 +PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -105,3 +109,4 @@ M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} +PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PACKAGE} diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 355b68a..635fa70 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -16,11 +16,11 @@ ZLIB_TAG=v1.2.8 LIBEVENT_TAG=release-2.0.21-stable MINGW_REV=6184 PYPTLIB_TAG=master -# Hardcoding this commit until #11535 is fixed -OBFSPROXY_TAG=b58fd9e1ef264796b6bddbde5db117472fb674a0 +OBFSPROXY_TAG=master FLASHPROXY_TAG=master -FTEPROXY_TAG=0.2.13 +FTEPROXY_TAG=master LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 +TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 GITIAN_TAG=tor-browser-builder-3.x-5 @@ -34,12 +34,13 @@ PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 -TWISTED_VER=13.1.0 +TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4 LXML_VER=3.3.5 HTTPSE_VER=3.5.1 +PARSLEY_VER=1.2 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz @@ -64,6 +65,7 @@ M2CRYPTO_PACKAGE=M2Crypto-${M2CRYPTO_VER}.tar.gz PY2EXE_PACKAGE=py2exe-${PY2EXE_VER}.win32-py2.7.exe SETUPTOOLS_PACKAGE=setuptools-${SETUPTOOLS_VER}.tar.gz LXML_PACKAGE=lxml-${LXML_VER}.tar.gz +PARSLEY_PACKAGE=Parsley-${PARSLEY_VER}.tar.gz # Hashes for packages with weak sigs or no sigs OPENSSL_HASH=53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028 @@ -79,10 +81,11 @@ PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4 PYYAML_HASH=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8 ZOPEINTERFACE_HASH=1a7c84716bbd9981915b64a81d8a3f076a5934a8c8df4224655469b3564940cc -TWISTED_HASH=110e957dd8fc4c6eaba8abe4f0477e60b2873e3cf1c260325863fd2ef69341c6 +TWISTED_HASH=095175638c019ac7c0604f4c291724a16ff1acd062e181b01293bf4dcbc62cf3 M2CRYPTO_HASH=25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a PY2EXE_HASH=610a8800de3d973ed5ed4ac505ab42ad058add18a68609ac09e6cf3598ef056c SETUPTOOLS_HASH=75d288687066ed124311d6ca5f40ffa92a0e81adcd7fff318c6e84082713cf39 +PARSLEY_HASH=50d30cee70770fd44db7cea421cb2fb75af247c3a1cd54885c06b30a7c85dd23 ## Non-git package URLs OPENSSL_URL=https://www.openssl.org/source/${OPENSSL_PACKAGE} @@ -106,3 +109,4 @@ M2CRYPTO_URL=https://pypi.python.org/packages/source/M/M2Crypto/${M2CRYPTO_… PY2EXE_URL=http://softlayer-dal.dl.sourceforge.net/project/py2exe/py2exe/${… SETUPTOOLS_URL=https://pypi.python.org/packages/source/s/setuptools/${SETUP… LXML_URL=https://pypi.python.org/packages/source/l/lxml/${LXML_PACKAGE} +PARSLEY_URL=https://pypi.python.org/packages/source/P/Parsley/${PARSLEY_PACKAGE}

1 0

[metrics-web/master] Add scramblesuit to list of transports.
by karsten＠torproject.org 08 May '14

08 May '14

commit a093354a4b931b4afc0d09e351f2fe92badf4239 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu May 8 09:35:35 2014 +0200 Add scramblesuit to list of transports. Implements part of #11799. --- .../src/org/torproject/metrics/web/graphs/GraphParameterChecker.java | 2 +- website/web/WEB-INF/users.jsp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java index 11ee80a..7b0ea9e 100644 --- a/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java +++ b/website/src/org/torproject/metrics/web/graphs/GraphParameterChecker.java @@ -59,7 +59,7 @@ public class GraphParameterChecker { this.knownParameterValues.put("source", "all,siv,moria,torperf"); this.knownParameterValues.put("filesize", "50kb,1mb,5mb"); this.knownParameterValues.put("transport", - "obfs2,obfs3,websocket,fte,meek,<OR>,<??>"); + "obfs2,obfs3,websocket,fte,meek,scramblesuit,<OR>,<??>"); this.knownParameterValues.put("version", "v4,v6"); this.knownParameterValues.put("p", "100,99,98,97,95,91,90,80,75,70," + "60,50,40,30,25,20,10,9,5,3,2,1,0"); diff --git a/website/web/WEB-INF/users.jsp b/website/web/WEB-INF/users.jsp index 632a659..91f8ca2 100644 --- a/website/web/WEB-INF/users.jsp +++ b/website/web/WEB-INF/users.jsp @@ -219,6 +219,7 @@ Bridge users by transport: <option value="websocket"<c:if test="${userstats_bridge_transport_transport[0] eq 'websocket'}"> selected</c:if>>Flash proxy/websocket</option> <option value="fte"<c:if test="${userstats_bridge_transport_transport[0] eq 'fte'}"> selected</c:if>>FTE</option> <option value="meek"<c:if test="${userstats_bridge_transport_transport[0] eq 'meek'}"> selected</c:if>>meek</option> + <option value="scramblesuit"<c:if test="${userstats_bridge_transport_transport[0] eq 'scramblesuit'}"> selected</c:if>>scramblesuit</option> <option value="<??>"<c:if test="${userstats_bridge_transport_transport[0] eq '<??>'}"> selected</c:if>>Unknown transport</option> </select> </p><p>

1 0

[meek/master] Something of a README.
by dcf＠torproject.org 08 May '14

08 May '14

commit 16cef5eac497d722a353f86187f3d492bd78b9a5 Author: David Fifield <david(a)bamsoftware.com> Date: Wed May 7 22:19:53 2014 -0700 Something of a README. --- README | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/README b/README index 839fe41..34429f1 100644 --- a/README +++ b/README @@ -1,3 +1,64 @@ +meek is a blocking-resistant pluggable transport for Tor. It encodes a +data stream as a sequence of HTTPS requests and responses. Requests are +reflected through a hard-to-block third-party web server in order to +avoid talking directly to a Tor bridge. HTTPS encryption hides +fingerprintable byte patterns in Tor traffic. + +https://trac.torproject.org/projects/tor/wiki/doc/meek + +The key trick that makes the system work is "domain fronting": +communicating with a forbidden domain in a way that makes it look like +you are communicating with an allowed domain. It works by putting the +allowed domain on the "outside" of a request: in the DNS query and the +SNI TLS extension; and the forbidden domain on the "inside": in the Host +header of the HTTP request. The trick works with web services that +ignore the SNI and handle requests based on the Host header. Google, +with its App Engine infrastructure at appspot.com, is one of these +services. A client wanting to communicate with a forbidden subdomain of +appspot.com while appearing to communicate with www.google.com can run +the client plugin program like this: + meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com + +The meek-client program by itself has a fingerprintable TLS handshake. +To disguise the TLS part of HTTPS connections, meek-client should be run +with the --helper option pointing at a browser extension that has been +set up separately. How it works is meek-client tells the browser what +URL to request, the browser requests it and returns the payload to +meek-client. The TLS implementation is that of the browser, so it better +blends in with allowed traffic. Browser extensions for Chrome and +Firefox are in the chrome and firefox directories. + +Here is a summary of the programs that appear in subdirectories. + +meek-client: +The client transport plugin, run by a censored client. + +meek-server: +The server transport plugin, run on a Tor relay. A public instance of +meek-server runs at meek.bamsoftware.com:7002. + +appengine: +Reflector web app that runs on Google App Engine. The reflector simply +copies requests and responses to an instance of meek-server somewhere. A +public instance of the App Engine web app is at +https://meek-reflect.appspot.com/. + +chrome, firefox: +Browser extensions for TLS camouflage. + +meek-client-torbrowser: +An auxiliary program for the Tor Browser Bundle that runs a copy of +Firefox with the browser extension and then configures meek-client to +use it as a helper. + +terminateprocess-buffer: +An auxiliary program used on Windows to assist with cleanup of +subprocesses. + +latencytest: +A test program for App Engine that measures roundtrip times to different +destinations. + To the extent possible under law, the authors have dedicated all copyright and related and neighboring rights to this software to the public domain worldwide. This software is distributed without any

1 0

[meek/master] Comment typo.
by dcf＠torproject.org 08 May '14

08 May '14

commit d8d8b21a8881638a6f753afb572e6c2c21919652 Author: David Fifield <david(a)bamsoftware.com> Date: Wed May 7 21:37:15 2014 -0700 Comment typo. --- meek-client/meek-client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index b191603..645d1ef 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -17,7 +17,7 @@ // using SOCKS args: // Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com // ClientTransportPlugin meek exec ./meek-client -// is the same as this one using command line options. +// is the same as this one using command line options: // Bridge meek 0.0.2.0:1 // ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com // The advantage of SOCKS args is that multiple Bridge lines can have different

1 0

[meek/master] http-proxy can be a SOCKS arg too.
by dcf＠torproject.org 08 May '14

08 May '14

commit 9c951ff6d77258e459c366c2ae7c24900c0cc922 Author: David Fifield <david(a)bamsoftware.com> Date: Wed May 7 21:23:54 2014 -0700 http-proxy can be a SOCKS arg too. --- meek-client/meek-client.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meek-client/meek-client.go b/meek-client/meek-client.go index b3cce7a..b191603 100644 --- a/meek-client/meek-client.go +++ b/meek-client/meek-client.go @@ -321,7 +321,7 @@ func main() { flag.StringVar(&options.Front, "front", "", "front domain name if no front= SOCKS arg") flag.StringVar(&helperAddr, "helper", "", "address of HTTP helper (browser extension)") - flag.StringVar(&httpProxy, "http-proxy", "", "HTTP proxy URL (default from HTTP_PROXY environment variable)") + flag.StringVar(&httpProxy, "http-proxy", "", "HTTP proxy URL (default from http-proxy= SOCKS arg or HTTP_PROXY environment variable)") flag.StringVar(&logFilename, "log", "", "name of log file") flag.StringVar(&options.URL, "url", "", "URL to request if no url= SOCKS arg") flag.Parse()

1 0

[meek/master] More doc comments.
by dcf＠torproject.org 08 May '14

08 May '14

commit 689c93402c49ef30b4c51ba27e996b2bb6e0109a Author: David Fifield <david(a)bamsoftware.com> Date: Wed May 7 21:50:51 2014 -0700 More doc comments. --- meek-server/meek-server.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meek-server/meek-server.go b/meek-server/meek-server.go index cdbf448..c8c8d88 100644 --- a/meek-server/meek-server.go +++ b/meek-server/meek-server.go @@ -6,6 +6,9 @@ // ServerTransportPlugin meek exec ./meek-server --port 8443 --cert cert.pem --key key.pem --log meek-server.log // Plain HTTP usage: // ServerTransportPlugin meek exec ./meek-server --port 8080 --disable-tls --log meek-server.log +// +// The server runs in HTTPS mode by default, and the --cert and --key options +// are required. Use the --disable-tls option to run with plain HTTP. package main import (

1 0

[meek/master] Man pages for meek-client and meek-server.
by dcf＠torproject.org 08 May '14

08 May '14

commit dd9074b389e8d187eff62bc42e968d0922fa1478 Author: David Fifield <david(a)bamsoftware.com> Date: Wed May 7 21:37:07 2014 -0700 Man pages for meek-client and meek-server. https://trac.torproject.org/projects/tor/ticket/11580 --- doc/Makefile | 11 +++++++ doc/meek-client.1.txt | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ doc/meek-server.1.txt | 64 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 156 insertions(+) diff --git a/doc/Makefile b/doc/Makefile new file mode 100644 index 0000000..967d944 --- /dev/null +++ b/doc/Makefile @@ -0,0 +1,11 @@ +MAN = meek-client.1 meek-server.1 + +all: $(MAN) + +%.1: %.1.txt + a2x --no-xmllint --xsltproc-opts "--stringparam man.th.title.max.length 11" -d manpage -f manpage $< + +clean: + rm -f $(MAN) + +.PHONY: all clean diff --git a/doc/meek-client.1.txt b/doc/meek-client.1.txt new file mode 100644 index 0000000..3f0e51f --- /dev/null +++ b/doc/meek-client.1.txt @@ -0,0 +1,81 @@ +// This file is asciidoc source code. +// To generate manpages, use the a2x command i.e. +// a2x --no-xmllint -d manpage -f manpage meek-client.1.txt +// see http://www.methods.co.nz/asciidoc/userguide.html#X1 +MEEK-CLIENT(1) +============== + +NAME +---- +meek-client - The meek client transport plugin + +SYNOPSIS +-------- +**meek-client** **--url**=__URL__ **--front**=__DOMAIN__ [__OPTIONS__] + +DESCRIPTION +----------- +meek-client is a transport plugin for Tor that encodes a stream as a +sequence of HTTP requests and responses. It is usually run with the +**--url** and **--front** options. The **--url** option controls what +URL requests are made to; the web server at that URL should be +configured to forward requests to a meek-server somewhere. The +**--front** option is for domain name camouflage: The domain name in the +URL is replaced by the front domain before the request is made, but the +Host header inside the HTTP request still points to the original domain. +The idea is to front through a domain that is not blocked to a domain +that is blocked. + +Configuration for meek-client usually appears in a torrc file. Most user +configuration can happen either through SOCKS args (i.e., args on a +Bridge line) or through command line options. SOCKS args take precedence +per-connection over command line options. For example, this +configuration using SOCKS args: +---- +Bridge meek 0.0.2.0:1 url=https://meek-reflect.appspot.com/ front=www.google.com +ClientTransportPlugin meek exec ./meek-client +---- +is the same as this one using command line options: +---- +Bridge meek 0.0.2.0:1 +ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com +---- +The advantage of SOCKS args is that multiple Bridge lines can have different +configurations. + +The **--helper** option prevents meek-client from doing any network +operations itself. Rather, it will send all requests through a browser +extension, which must be set up separately. + +OPTIONS +------- +**--front**=__DOMAIN__:: + Front domain name. The **front** SOCKS arg overrides the command + line. + +**--helper**=__ADDRESS__:: + Address of HTTP helper browser extension. For example, + **--helper 127.0.0.1:7000**. + +**--http-proxy**=__URL__:: + URL of HTTP proxy. If not given, the proxy URL may be taken from the + The **http-proxy** SOCKS arg overrides the command line. For + example, **--http-proxy=http://localhost:8787/**. + +**--log**=__FILENAME__:: + Name of a file to write log messages to (default stderr). + +**--url**=__URL__:: + URL to correspond with. The domain part of the URL may be modified + by **--front**. + +**-h**, **--help**:: + Display a help message and exit. + +SEE ALSO +-------- +**https://trac.torproject.org/projects/tor/wiki/doc/meek** + +BUGS +---- +Please report at **https://trac.torproject.org/projects/tor**. diff --git a/doc/meek-server.1.txt b/doc/meek-server.1.txt new file mode 100644 index 0000000..cb3b151 --- /dev/null +++ b/doc/meek-server.1.txt @@ -0,0 +1,64 @@ +// This file is asciidoc source code. +// To generate manpages, use the a2x command i.e. +// a2x --no-xmllint -d manpage -f manpage meek-client.1.txt +// see http://www.methods.co.nz/asciidoc/userguide.html#X1 +MEEK-SERVER(1) +============== + +NAME +---- +meek-server - The meek server transport plugin + +SYNOPSIS +-------- +**meek-server** **--cert**=__FILENAME__ **--key**=__FILENAME__ [__OPTIONS__] + +DESCRIPTION +----------- +meek-server is a transport plugin for Tor that encodes a stream as a +sequence of HTTP requests and responses. + +The server runs in HTTPS mode by default, and the **--cert** and +**--key** options are required. Use the **--disable-tls** option to run +with plain HTTP. + +Configuration for meek-server usually appears in a torrc file. Here is a +sample configuration using HTTPS: +---- +ServerTransportPlugin meek exec ./meek-server --port 8443 --cert cert.pem --key key.pem --log meek-server.log +---- +Here is a sample configuration using plain HTTP: +---- +ServerTransportPlugin meek exec ./meek-server --port 8080 --disable-tls --log meek-server.log +---- + +OPTIONS +------- +**--cert**=__FILENAME__:: + Name of a PEM-encoded TLS certificate file. Required unless + **--disable-tls** is used. + +**--disable-tls**: + Use plain HTTP rather than HTTPS. + +**--key**=__FILENAME__: + Name of a PEM-encoded TLS private key file. Required unless + **--disable-tls** is used. + +**--log**=__FILENAME__:: + Name of a file to write log messages to (default stderr). + +**--port**=__PORT__:: + Port to listen on. Overrides the TOR_PT_SERVER_BINDADDR environment + variable set by tor. + +**-h**, **--help**:: + Display a help message and exit. + +SEE ALSO +-------- +**https://trac.torproject.org/projects/tor/wiki/doc/meek** + +BUGS +---- +Please report at **https://trac.torproject.org/projects/tor**.

1 0

[meek/master] Generate man pages.
by dcf＠torproject.org 08 May '14

08 May '14

commit bacbdb31abf5710236ffa29b09bc525e09ec5dc5 Author: David Fifield <david(a)bamsoftware.com> Date: Wed May 7 21:51:29 2014 -0700 Generate man pages. --- doc/meek-client.1 | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++ doc/meek-server.1 | 96 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 207 insertions(+) diff --git a/doc/meek-client.1 b/doc/meek-client.1 new file mode 100644 index 0000000..51b31ca --- /dev/null +++ b/doc/meek-client.1 @@ -0,0 +1,111 @@ +'\" t +.\" Title: meek-client +.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 05/07/2014 +.\" Manual: \ \& +.\" Source: \ \& +.\" Language: English +.\" +.TH "MEEK\-CLIEN" "1" "05/07/2014" "\ \&" "\ \&" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +meek-client \- The meek client transport plugin +.SH "SYNOPSIS" +.sp +\fBmeek\-client\fR \fB\-\-url\fR=\fIURL\fR \fB\-\-front\fR=\fIDOMAIN\fR [\fIOPTIONS\fR] +.SH "DESCRIPTION" +.sp +meek\-client is a transport plugin for Tor that encodes a stream as a sequence of HTTP requests and responses\&. It is usually run with the \fB\-\-url\fR and \fB\-\-front\fR options\&. The \fB\-\-url\fR option controls what URL requests are made to; the web server at that URL should be configured to forward requests to a meek\-server somewhere\&. The \fB\-\-front\fR option is for domain name camouflage: The domain name in the URL is replaced by the front domain before the request is made, but the Host header inside the HTTP request still points to the original domain\&. The idea is to front through a domain that is not blocked to a domain that is blocked\&. +.sp +Configuration for meek\-client usually appears in a torrc file\&. Most user configuration can happen either through SOCKS args (i\&.e\&., args on a Bridge line) or through command line options\&. SOCKS args take precedence per\-connection over command line options\&. For example, this configuration using SOCKS args: +.sp +.if n \{\ +.RS 4 +.\} +.nf +Bridge meek 0\&.0\&.2\&.0:1 url=https://meek\-reflect\&.appspot\&.com/ front=www\&.google\&.com +ClientTransportPlugin meek exec \&./meek\-client +.fi +.if n \{\ +.RE +.\} +.sp +is the same as this one using command line options: +.sp +.if n \{\ +.RS 4 +.\} +.nf +Bridge meek 0\&.0\&.2\&.0:1 +ClientTransportPlugin meek exec \&./meek\-client \-\-url=https://meek\-reflect\&.appspot\&.com/ \-\-front=www\&.google\&.com +.fi +.if n \{\ +.RE +.\} +.sp +The advantage of SOCKS args is that multiple Bridge lines can have different configurations\&. +.sp +The \fB\-\-helper\fR option prevents meek\-client from doing any network operations itself\&. Rather, it will send all requests through a browser extension, which must be set up separately\&. +.SH "OPTIONS" +.PP +\fB\-\-front\fR=\fIDOMAIN\fR +.RS 4 +Front domain name\&. The +\fBfront\fR +SOCKS arg overrides the command line\&. +.RE +.PP +\fB\-\-helper\fR=\fIADDRESS\fR +.RS 4 +Address of HTTP helper browser extension\&. For example, +\fB\-\-helper 127\&.0\&.0\&.1:7000\fR\&. +.RE +.PP +\fB\-\-http\-proxy\fR=\fIURL\fR +.RS 4 +URL of HTTP proxy\&. If not given, the proxy URL may be taken from the The +\fBhttp\-proxy\fR +SOCKS arg overrides the command line\&. For example, +\fB\-\-http\-proxy=http://localhost:8787/\fR\&. +.RE +.PP +\fB\-\-log\fR=\fIFILENAME\fR +.RS 4 +Name of a file to write log messages to (default stderr)\&. +.RE +.PP +\fB\-\-url\fR=\fIURL\fR +.RS 4 +URL to correspond with\&. The domain part of the URL may be modified by +\fB\-\-front\fR\&. +.RE +.PP +\fB\-h\fR, \fB\-\-help\fR +.RS 4 +Display a help message and exit\&. +.RE +.SH "SEE ALSO" +.sp +\fBhttps://trac\&.torproject\&.org/projects/tor/wiki/doc/meek\fR +.SH "BUGS" +.sp +Please report at \fBhttps://trac\&.torproject\&.org/projects/tor\fR\&. diff --git a/doc/meek-server.1 b/doc/meek-server.1 new file mode 100644 index 0000000..9dc3f07 --- /dev/null +++ b/doc/meek-server.1 @@ -0,0 +1,96 @@ +'\" t +.\" Title: meek-server +.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 05/07/2014 +.\" Manual: \ \& +.\" Source: \ \& +.\" Language: English +.\" +.TH "MEEK\-SERVE" "1" "05/07/2014" "\ \&" "\ \&" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +meek-server \- The meek server transport plugin +.SH "SYNOPSIS" +.sp +\fBmeek\-server\fR \fB\-\-cert\fR=\fIFILENAME\fR \fB\-\-key\fR=\fIFILENAME\fR [\fIOPTIONS\fR] +.SH "DESCRIPTION" +.sp +meek\-server is a transport plugin for Tor that encodes a stream as a sequence of HTTP requests and responses\&. +.sp +The server runs in HTTPS mode by default, and the \fB\-\-cert\fR and \fB\-\-key\fR options are required\&. Use the \fB\-\-disable\-tls\fR option to run with plain HTTP\&. +.sp +Configuration for meek\-server usually appears in a torrc file\&. Here is a sample configuration using HTTPS: +.sp +.if n \{\ +.RS 4 +.\} +.nf +ServerTransportPlugin meek exec \&./meek\-server \-\-port 8443 \-\-cert cert\&.pem \-\-key key\&.pem \-\-log meek\-server\&.log +.fi +.if n \{\ +.RE +.\} +.sp +Here is a sample configuration using plain HTTP: +.sp +.if n \{\ +.RS 4 +.\} +.nf +ServerTransportPlugin meek exec \&./meek\-server \-\-port 8080 \-\-disable\-tls \-\-log meek\-server\&.log +.fi +.if n \{\ +.RE +.\} +.SH "OPTIONS" +.PP +\fB\-\-cert\fR=\fIFILENAME\fR +.RS 4 +Name of a PEM\-encoded TLS certificate file\&. Required unless +\fB\-\-disable\-tls\fR +is used\&. +.RE +.sp +\fB\-\-disable\-tls\fR: Use plain HTTP rather than HTTPS\&. +.sp +\fB\-\-key\fR=\fIFILENAME\fR: Name of a PEM\-encoded TLS private key file\&. Required unless \fB\-\-disable\-tls\fR is used\&. +.PP +\fB\-\-log\fR=\fIFILENAME\fR +.RS 4 +Name of a file to write log messages to (default stderr)\&. +.RE +.PP +\fB\-\-port\fR=\fIPORT\fR +.RS 4 +Port to listen on\&. Overrides the TOR_PT_SERVER_BINDADDR environment variable set by tor\&. +.RE +.PP +\fB\-h\fR, \fB\-\-help\fR +.RS 4 +Display a help message and exit\&. +.RE +.SH "SEE ALSO" +.sp +\fBhttps://trac\&.torproject\&.org/projects/tor/wiki/doc/meek\fR +.SH "BUGS" +.sp +Please report at \fBhttps://trac\&.torproject\&.org/projects/tor\fR\&.

1 0

[tor/master] Return success when get_total_system_memory() succeeds.
by nickm＠torproject.org 08 May '14

08 May '14

commit a32d7e1910176deef62583cef5d1195257bf3e17 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 8 00:32:22 2014 -0400 Return success when get_total_system_memory() succeeds. Fixes bug 11805; bugfix on 0.2.5.4-alpha. --- changes/bug11805 | 5 +++++ src/common/compat.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug11805 b/changes/bug11805 new file mode 100644 index 0000000..02a5538 --- /dev/null +++ b/changes/bug11805 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Correctly detect the total available system memory. We tried to do this + in 0.2.5.4-alpha, but the code was set up to always return an error + value, even on success. + Fixes bug 11805; bugfix on 0.2.5.4-alpha. diff --git a/src/common/compat.c b/src/common/compat.c index 974f697..7a444df 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -3453,6 +3453,6 @@ get_total_system_memory(size_t *mem_out) *mem_out = mem_cached = (size_t) m; - return -1; + return 0; }

1 0

[flashproxy/master] Don't link to pluggable-transports page in man pages.
by dcf＠torproject.org 08 May '14

08 May '14

commit ddb954a559777da8bf14fcaed96d99b080e9eb01 Author: David Fifield <david(a)bamsoftware.com> Date: Wed May 7 20:52:44 2014 -0700 Don't link to pluggable-transports page in man pages. --- doc/flashproxy-client.1 | 6 ++---- doc/flashproxy-client.1.txt | 2 -- doc/flashproxy-reg-appspot.1 | 6 ++---- doc/flashproxy-reg-appspot.1.txt | 2 -- doc/flashproxy-reg-email.1 | 6 ++---- doc/flashproxy-reg-email.1.txt | 2 -- doc/flashproxy-reg-http.1 | 6 ++---- doc/flashproxy-reg-http.1.txt | 2 -- doc/flashproxy-reg-url.1 | 8 +++----- doc/flashproxy-reg-url.1.txt | 2 -- 10 files changed, 11 insertions(+), 31 deletions(-) diff --git a/doc/flashproxy-client.1 b/doc/flashproxy-client.1 index 74b0d30..ca90286 100644 --- a/doc/flashproxy-client.1 +++ b/doc/flashproxy-client.1 @@ -2,12 +2,12 @@ .\" Title: flashproxy-client .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 10/09/2013 +.\" Date: 05/07/2014 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-CLIENT" "1" "10/09/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-CLIENT" "1" "05/07/2014" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -149,8 +149,6 @@ Don\(cqt scrub IP addresses from logs\&. .SH "SEE ALSO" .sp \fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR -.sp -\fBhttps://www\&.torproject\&.org/docs/pluggable\-transports\&.html\&.en\fR .SH "BUGS" .sp Please report using \fBhttps://trac\&.torproject\&.org/projects/tor\fR\&. diff --git a/doc/flashproxy-client.1.txt b/doc/flashproxy-client.1.txt index b4779a2..78a3598 100644 --- a/doc/flashproxy-client.1.txt +++ b/doc/flashproxy-client.1.txt @@ -99,8 +99,6 @@ SEE ALSO -------- **http://crypto.stanford.edu/flashproxy/** -**https://www.torproject.org/docs/pluggable-transports.html.en** - BUGS ---- Please report using **https://trac.torproject.org/projects/tor**. diff --git a/doc/flashproxy-reg-appspot.1 b/doc/flashproxy-reg-appspot.1 index 9af7346..551bf37 100644 --- a/doc/flashproxy-reg-appspot.1 +++ b/doc/flashproxy-reg-appspot.1 @@ -2,12 +2,12 @@ .\" Title: flashproxy-reg-appspot .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 10/10/2013 +.\" Date: 05/07/2014 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-APPSPOT" "1" "10/10/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-APPSPOT" "1" "05/07/2014" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -80,8 +80,6 @@ Don\(cqt scrub IP addresses from logs\&. .SH "SEE ALSO" .sp \fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR -.sp -\fBhttps://www\&.torproject\&.org/docs/pluggable\-transports\&.html\&.en\fR .SH "BUGS" .sp Please report using \fBhttps://trac\&.torproject\&.org/projects/tor\fR\&. diff --git a/doc/flashproxy-reg-appspot.1.txt b/doc/flashproxy-reg-appspot.1.txt index 9b5a124..bc3a4d5 100644 --- a/doc/flashproxy-reg-appspot.1.txt +++ b/doc/flashproxy-reg-appspot.1.txt @@ -57,8 +57,6 @@ SEE ALSO -------- **http://crypto.stanford.edu/flashproxy/** -**https://www.torproject.org/docs/pluggable-transports.html.en** - BUGS ---- Please report using **https://trac.torproject.org/projects/tor**. diff --git a/doc/flashproxy-reg-email.1 b/doc/flashproxy-reg-email.1 index eac32cc..69eb146 100644 --- a/doc/flashproxy-reg-email.1 +++ b/doc/flashproxy-reg-email.1 @@ -2,12 +2,12 @@ .\" Title: flashproxy-reg-email .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 10/10/2013 +.\" Date: 05/07/2014 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-EMAIL" "1" "10/10/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-EMAIL" "1" "05/07/2014" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -99,8 +99,6 @@ Don\(cqt scrub IP addresses from logs\&. .SH "SEE ALSO" .sp \fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR -.sp -\fBhttps://www\&.torproject\&.org/docs/pluggable\-transports\&.html\&.en\fR .SH "BUGS" .sp Please report using \fBhttps://trac\&.torproject\&.org/projects/tor\fR\&. diff --git a/doc/flashproxy-reg-email.1.txt b/doc/flashproxy-reg-email.1.txt index 1adc242..2e2bfd5 100644 --- a/doc/flashproxy-reg-email.1.txt +++ b/doc/flashproxy-reg-email.1.txt @@ -68,8 +68,6 @@ SEE ALSO -------- **http://crypto.stanford.edu/flashproxy/** -**https://www.torproject.org/docs/pluggable-transports.html.en** - BUGS ---- Please report using **https://trac.torproject.org/projects/tor**. diff --git a/doc/flashproxy-reg-http.1 b/doc/flashproxy-reg-http.1 index ea88705..1d70158 100644 --- a/doc/flashproxy-reg-http.1 +++ b/doc/flashproxy-reg-http.1 @@ -2,12 +2,12 @@ .\" Title: flashproxy-reg-http .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 10/10/2013 +.\" Date: 05/07/2014 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-HTTP" "1" "10/10/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-HTTP" "1" "05/07/2014" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -71,8 +71,6 @@ Don\(cqt scrub IP addresses from logs\&. .SH "SEE ALSO" .sp \fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR -.sp -\fBhttps://www\&.torproject\&.org/docs/pluggable\-transports\&.html\&.en\fR .SH "BUGS" .sp Please report using \fBhttps://trac\&.torproject\&.org/projects/tor\fR\&. diff --git a/doc/flashproxy-reg-http.1.txt b/doc/flashproxy-reg-http.1.txt index cae719c..0acbeec 100644 --- a/doc/flashproxy-reg-http.1.txt +++ b/doc/flashproxy-reg-http.1.txt @@ -43,8 +43,6 @@ SEE ALSO -------- **http://crypto.stanford.edu/flashproxy/** -**https://www.torproject.org/docs/pluggable-transports.html.en** - BUGS ---- Please report using **https://trac.torproject.org/projects/tor**. diff --git a/doc/flashproxy-reg-url.1 b/doc/flashproxy-reg-url.1 index ec3cf1d..331b2c2 100644 --- a/doc/flashproxy-reg-url.1 +++ b/doc/flashproxy-reg-url.1 @@ -2,12 +2,12 @@ .\" Title: flashproxy-reg-url .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> -.\" Date: 10/09/2013 +.\" Date: 05/07/2014 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "FLASHPROXY\-REG\-URL" "1" "10/09/2013" "\ \&" "\ \&" +.TH "FLASHPROXY\-REG\-URL" "1" "05/07/2014" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -39,7 +39,7 @@ Print a URL, which, when retrieved, will cause the client address \fIREMOTE\fR[: .PP \fB\-f\fR, \fB\-\-facilitator\fR=\fIURL\fR .RS 4 -Register with the given facilitator (by default "https://fp\-facilitator\&.org/")\&. +Register with the given facilitator (default "https://fp\-facilitator\&.org/")\&. .RE .PP \fB\-\-facilitator\-pubkey\fR=\fIFILENAME\fR @@ -80,8 +80,6 @@ Copy this string and paste it into any URL fetching website or program\&. Once t .SH "SEE ALSO" .sp \fBhttp://crypto\&.stanford\&.edu/flashproxy/\fR -.sp -\fBhttps://www\&.torproject\&.org/docs/pluggable\-transports\&.html\&.en\fR .SH "BUGS" .sp Please report using \fBhttps://trac\&.torproject\&.org/projects/tor\fR\&. diff --git a/doc/flashproxy-reg-url.1.txt b/doc/flashproxy-reg-url.1.txt index 42757c9..5465dfa 100644 --- a/doc/flashproxy-reg-url.1.txt +++ b/doc/flashproxy-reg-url.1.txt @@ -53,8 +53,6 @@ SEE ALSO -------- **http://crypto.stanford.edu/flashproxy/** -**https://www.torproject.org/docs/pluggable-transports.html.en** - BUGS ---- Please report using **https://trac.torproject.org/projects/tor**.

1 0