June 2013 - tor-commits - lists.torproject.org

[ooni-probe/develop] Add Exception classes for conditions when the network is not reachable and
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 0dc64291dcf0c4ad6459d20b33123fc9cbe71ed6 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 28 01:45:54 2013 +0000 Add Exception classes for conditions when the network is not reachable and when a TLS/SSL context was not chosen from the test commandline options. --- nettests/experimental/tls_handshake.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index d909603..fc673cb 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -54,6 +54,22 @@ firefox_ciphers = ["ECDHE-ECDSA-AES256-SHA", "DHE-DSS-CAMELLIA128-SHA",] +class NoSSLContextError(Exception): + """ + Raised when we're missing the SSL context method, which should be one of + the following: + + * :attr:`OpenSSL.SSL.SSLv2_METHOD` + * :attr:`OpenSSL.SSL.SSLv23_METHOD` + * :attr:`OpenSSL.SSL.SSLv3_METHOD` + * :attr:`OpenSSL.SSL.TLSv1_METHOD` + """ + pass + +class HostUnreachableError(Exception): + """Raised when there the host IP address appears to be unreachable.""" + pass + class UsageOptions(usage.Options): optParameters = [ ['host', 'h', None, 'Remote host IP address (v4/v6)'],

1 0

[ooni-probe/develop] Fix an error in the commandline options parsing which allowed commandline host
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit ac8824101fb99e5fd06e03d36bac1ffe7d03293d Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 28 01:49:57 2013 +0000 Fix an error in the commandline options parsing which allowed commandline host IP:port inputs in addition to a file of inputs, which would throw off the input_id counter and mess up reporting. --- nettests/experimental/tls_handshake.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index fc673cb..7f3c8ad 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -103,10 +103,8 @@ class TLSHandshakeTest(nettest.NetTestCase): self.ciphers = [] self.methods = [] - ## check that we're actually testing an IP:PORT, else exit - ## gracefully: - if not (options['host'] and options['port']) \ - and not options['file']: + ## check that we're testing an IP:PORT, else exit gracefully: + if not ((options['host'] and options['port']) or options['file']): sys.exit("Need --host and --port, or --file!") ## set the SSL/TLS method to use:

1 0

[ooni-probe/develop] Add notes explaining defaults chosen if no commandline options are chosen, and
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit a4254fd3e90e3960497be61d4abd4eaf34cdce73 Author: Isis Lovecruft <isis(a)torproject.org> Date: Thu Feb 28 01:53:25 2013 +0000 Add notes explaining defaults chosen if no commandline options are chosen, and a note-to-self to explain to users that currently only one TLS/SSL context method can be chosen at a time. * TODO add support for looping through multiple TLS/SSL contexts. --- nettests/experimental/tls_handshake.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nettests/experimental/tls_handshake.py b/nettests/experimental/tls_handshake.py index 7f3c8ad..6474792 100644 --- a/nettests/experimental/tls_handshake.py +++ b/nettests/experimental/tls_handshake.py @@ -107,16 +107,19 @@ class TLSHandshakeTest(nettest.NetTestCase): if not ((options['host'] and options['port']) or options['file']): sys.exit("Need --host and --port, or --file!") + ## xxx TODO there's nothing that tells the user they can only have + ## one of the TLS/SSL methods at a time. + ## set the SSL/TLS method to use: for method in ['ssl2', 'ssl3', 'tls1']: if options[method]: self.methods.append(method) - ## if we weren't given a file with a list of ciphersuites to use, - ## then use the firefox default list: if not options['ciphersuite']: self.ciphers = firefox_ciphers else: + ## if we weren't given a file with a list of ciphersuites to + ## use, then use the firefox default list: if os.path.isfile(options['ciphersuite']): with open(options['ciphersuite']) as cipherfile: for line in cipherfile.readlines():

1 0

[oonib/master] Merge pull request #4 from stephen-soltesz/master
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit 7a205ca4431baa2142564d1327055d61c76e7d5d Merge: aeccb1f afd35d9 Author: Arturo Filastò <hellais(a)gmail.com> Date: Thu Jun 6 08:07:26 2013 -0700 Merge pull request #4 from stephen-soltesz/master remove M-Lab specific dir for init/* scripts. scripts/init/initialize.sh | 88 ------------------------------------ scripts/init/prepare.sh | 108 -------------------------------------------- scripts/init/start.sh | 5 -- scripts/init/stop.sh | 4 -- 4 files changed, 205 deletions(-)

1 0

[oonib/master] Include backend version in logfile and report
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit aeccb1f4a8399a4d9f8444dd55535382b5e069ef Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jun 6 16:43:05 2013 +0200 Include backend version in logfile and report Bump version in __init__ to 0.9 --- oonib/__init__.py | 2 +- oonib/log.py | 1 + oonib/report/file_collector.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/oonib/__init__.py b/oonib/__init__.py index 8ddad00..a612c5a 100644 --- a/oonib/__init__.py +++ b/oonib/__init__.py @@ -16,7 +16,7 @@ from storm.databases.sqlite import SQLite import string import random -__version__ = '0.0.1' +__version__ = '0.9' class Storage(dict): """ diff --git a/oonib/log.py b/oonib/log.py index 14b203d..6a35ecf 100644 --- a/oonib/log.py +++ b/oonib/log.py @@ -46,6 +46,7 @@ def start(logfile=None, application_name="oonib"): txlog.msg("Starting %s on %s (%s UTC)" % (application_name, otime.prettyDateNow(), otime.utcPrettyDateNow())) + txlog.msg("oonib version %s" % config.backend_version) txlog.startLoggingWithObserver(LogWithNoPrefix(sys.stdout).emit) txlog.addObserver(txlog.FileLogObserver(daily_logfile).emit) diff --git a/oonib/report/file_collector.py b/oonib/report/file_collector.py index 8c43657..2f7ac48 100644 --- a/oonib/report/file_collector.py +++ b/oonib/report/file_collector.py @@ -132,6 +132,7 @@ class NewReportHandlerFile(web.RequestHandler): test_version = report_data['test_version'] probe_asn = report_data['probe_asn'] content = report_data['content'] + content['backend_version'] = config.backend_version if not probe_asn: probe_asn = "AS0" @@ -148,8 +149,7 @@ class NewReportHandlerFile(web.RequestHandler): 'report_id': report_id } - self.writeToReport(report_filename, - report_data['content']) + self.writeToReport(report_filename, content) self.write(response)

1 0

[oonib/master] Delete M-Lab specific init/* dir.
by isis＠torproject.org 06 Jun '13

06 Jun '13

commit afd35d9cec675d269b03c002a2a5187d3b9302c6 Author: stephen soltesz <stephen.soltesz(a)gmail.com> Date: Thu Jun 6 14:29:26 2013 +0000 Delete M-Lab specific init/* dir. See instead: https://github.com/m-lab-tools/ooni-support/init --- scripts/init/initialize.sh | 88 ------------------------------------ scripts/init/prepare.sh | 108 -------------------------------------------- scripts/init/start.sh | 5 -- scripts/init/stop.sh | 4 -- 4 files changed, 205 deletions(-) diff --git a/scripts/init/initialize.sh b/scripts/init/initialize.sh deleted file mode 100755 index 3196f16..0000000 --- a/scripts/init/initialize.sh +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/bash - -# 1. Fetch any dependencies -# we should have everything in the virtualenv? Or do we need to also get some -# system libraries? libyaml, anyone? -# XXX: Can we get a newer version of libyaml from a fc-xx repo? -# -# we'll need libyaml.h from the system's libraries, afaik. i don't know what -# the fc* repos have though. --isis -source /etc/mlab/slice-functions - -# 2. Generate a ssl certificate -SCRIPT_ROOT=`pwd` -cd $SCRIPT_ROOT - -#XXX: we should think about setting these fields more carefully -OPENSSL_SUBJECT="/C=US/ST=CA/CN="`hostname` -OPENSSL_PASS=file:$SCRIPT_ROOT/cert.pass -dd if=/dev/random of=$SCRIPT_ROOT/cert.pass bs=32 count=1 -openssl genrsa -des3 -passout $OPENSSL_PASS -out private.key 4096 -openssl req -new -passin $OPENSSL_PASS -key private.key -out server.csr -subj $OPENSSL_SUBJECT -cp private.key private.key.org - -# Remove passphrase from key -openssl rsa -passin file:$SCRIPT_ROOT/cert.pass -in private.key.org -out private.key -chmod 600 private.key -openssl x509 -req -days 365 -in server.csr -signkey private.key -out certificate.crt -rm private.key.org -rm cert.pass - -# get the UID and GID to drop privileges to -OONIB_UID=`id -u $SLICENAME` -OONIB_GID=`id -g $SLICENAME` - -# randomly select either a tcp backend helper or a http backend helper to listen on port 80. Otherwise, bind to port 81 -coin=$[$RANDOM % 2] -if [[ $coin > 0 ]]; then - TCP_ECHO_PORT=80 - HTTP_ECHO_PORT=81 -else - TCP_ECHO_PORT=81 - HTTP_ECHO_PORT=80 -fi - -# drop a config in $SCRIPT_ROOT -echo " -main: - report_dir: '/var/spool/$SLICENAME' - tor_datadir: - database_uri: 'sqlite://"$SCRIPT_ROOT"/oonib_test_db.db' - db_threadpool_size: 10 - tor_binary: '"$SCRIPT_ROOT"/bin/tor' - tor2webmode: true - pidfile: 'oonib.pid' - nodaemon: false - originalname: Null - chroot: Null - rundir: . - umask: Null - euid: Null - uid: $OONIB_UID - gid: $OONIB_GID - uuid: Null - no_save: true - profile: Null - debug: Null - -helpers: - http_return_request: - port: $HTTP_ECHO_PORT - server_version: Apache - - tcp_echo: - port: $TCP_ECHO_PORT - - daphn3: - yaml_file: Null - pcap_file: Null - port: 57003 - - dns: - udp_port: 57004 - tcp_port: 57005 - - ssl: - private_key: '"$SCRIPT_ROOT"/private.key' - certificate: '"$SCRIPT_ROOT"/certificate.crt' - port: 443" > $SCRIPT_ROOT/oonib.conf diff --git a/scripts/init/prepare.sh b/scripts/init/prepare.sh deleted file mode 100755 index f61de4d..0000000 --- a/scripts/init/prepare.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh - -# Warning -# We advise installing virtualenv-1.9 or greater. Prior to version 1.9, the pip -# included in virtualenv did not not download from PyPI over SSL. -# Solution, use virtualenv-1.9 -# XXX: where is a signed release for any of virtualenv? - -# XXX -# Retrieved from http://www.virtualenv.org/en/1.9.X/news.html Mar 6 2013 -# Warning -# Python bugfix releases 2.6.8, 2.7.3, 3.1.5 and 3.2.3 include a change that will -# cause “import random” to fail with “cannot import name urandom” on any -# virtualenv created on a Unix host with an earlier release of Python -# 2.6/2.7/3.1/3.2, if the underlying system Python is upgraded. This is due to -# the fact that a virtualenv uses the system Python’s standard library but -# contains its own copy of the Python interpreter, so an upgrade to the system -# Python results in a mismatch between the version of the Python interpreter and -# the version of the standard library. It can be fixed by removing -# $ENV/bin/python and re-running virtualenv on the same target directory with the -# upgraded Python. - -# In the wild: -# http://stackoverflow.com/questions/10366821/python-importerror-cannot-impor… - -# Solution: Redeploy oonib after upgrading python 2.6.6 to 2.6.8 - -OONIB_GIT_REPO=ooni-backend -OONIB_GIT_URL="https://github.com/TheTorProject/$OONIB_GIT_REPO.git" -OONIB_GIT_TAG=master -#OONIB_GIT_REPO=oonib -#OONIB_GIT_URL="https://github.com/TheTorProject/$OONIB_GIT_REPO.git" -#OONIB_GIT_TAG=0.0.10 - -VIRTUALENV_GIT_REPO=virtualenv -VIRTUALENV_GIT_URL="https://github.com/pypa/$VIRTUALENV_GIT_REPO.git" -VIRTUALENV_GIT_TAG=1.9rc2 - -echo Installing build tools -sudo yum groupinstall -y Development\ Tools - -echo Installing openssl-devel -sudo yum install -y openssl-devel - -echo Installing glibc-static -sudo yum install -y glibc-static - -echo Installing python-devel -sudo yum install -y python-devel - -SLICE_NAME=mlab_ooni -# Run relative to where the script was called -SCRIPT_ROOT=`pwd` -# Run relative to our slice path -#SCRIPT_ROOT=/home/$SLICE_NAME -DEPLOY_PATH=$SCRIPT_ROOT/oonib-deploy.`date +%s`.tar.gz - -echo Downloading $OONIB_GIT_REPO $OONIB_GIT_TAG -OONIB_PATH=$SCRIPT_ROOT/$OONIB_GIT_REPO -# does the repository already exist? If not, fetch it -if [ ! -e $OONIB_PATH ] ; then - echo Fetching the $OONIB_GIT_REPO repository - git clone $OONIB_GIT_URL $OONIB_PATH -fi -cd $OONIB_PATH -git fetch origin -git checkout $OONIB_GIT_TAG -#XXX: git-verify-tag $OONIB_GIT_TAG - -# Get a copy of virtualenv -echo Downloading $VIRTUALENV_GIT_REPO $VIRTUALENV_GIT_TAG -VIRTUALENV_PATH=$SCRIPT_ROOT/$VIRTUALENV_GIT_REPO -if [ ! -e $VIRTUALENV_PATH ] ; then - git clone $VIRTUALENV_GIT_URL $VIRTUALENV_PATH -fi -cd $VIRTUALENV_PATH -git fetch origin -git checkout $VIRTUALENV_GIT_TAG -#XXX: git verify-tag $VIRTUALENV_GIT_TAG - -# See warning. Remove python and redeploy virtualenv with current python -PYTHON_EXE=$SCRIPT_ROOT/bin/python -if [ -e $PYTHON_EXE ] ; then - rm $PYTHON_EXE -fi -python $VIRTUALENV_PATH/virtualenv.py --no-site-packages $SCRIPT_ROOT -if [ ! -e $PYTHON_EXE ] ; then - exit 1 -fi - -# run setup.py and fetch dependencies -cd $OONIB_PATH -$PYTHON_EXE setup.py install - -# build a static tor -mkdir -p $SCRIPT_ROOT/ -cd $SCRIPT_ROOT -$OONIB_PATH/scripts/build_tor2web_tor.sh - -# add to bin -if [ -e $SCRIPT_ROOT/tor ]; then - cp $SCRIPT_ROOT/tor $SCRIPT_ROOT/bin/ -fi - -# drop the init scripts into $SCRIPT_ROOT -cp -r $OONIB_GIT_REPO/scripts/init $SCRIPT_ROOT -# or just tar up the entire cwd and call it done, son. -tar -C $SCRIPT_ROOT -czf $DEPLOY_PATH bin lib init $OONIB_GIT_REPO diff --git a/scripts/init/start.sh b/scripts/init/start.sh deleted file mode 100755 index d4ec504..0000000 --- a/scripts/init/start.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -source /etc/mlab/slice-functions -cd $SLICEHOME -sudo -u $SLICENAME bin/oonib -c $SLICEHOME/oonib.conf & diff --git a/scripts/init/stop.sh b/scripts/init/stop.sh deleted file mode 100755 index af58da9..0000000 --- a/scripts/init/stop.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -source /etc/mlab/slice-functions -cd $SLICEHOME -sudo -u $SLICENAME kill `cat $SLICEHOME/oonib.pid`

1 0

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 06 Jun '13

06 Jun '13

commit 977c985a6c95d7f47d77ee3878734bfa058b2d8e Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 6 13:46:16 2013 +0000 Update translations for tails-persistence-setup_completed --- ja/ja.po | 327 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 327 insertions(+) diff --git a/ja/ja.po b/ja/ja.po new file mode 100644 index 0000000..ab852b7 --- /dev/null +++ b/ja/ja.po @@ -0,0 +1,327 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Tails developers +# This file is distributed under the same license as the PACKAGE package. +# +# Translators: +# plazmism <gomidori(a)live.jp>, 2013 +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2012-11-27 21:00+0100\n" +"PO-Revision-Date: 2013-06-06 13:30+0000\n" +"Last-Translator: plazmism <gomidori(a)live.jp>\n" +"Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: ja\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:48 +msgid "Personal Data" +msgstr "個人データ" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:50 +msgid "Keep files stored in the `Persistent' directory" +msgstr "`永続的'ディレクトリに保管されたファイルを保つ" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:58 +msgid "GnuPG" +msgstr "GnuPG" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:60 +msgid "GnuPG keyrings and configuration" +msgstr "GnuPGのキーホルダーと設定" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:68 +msgid "SSH Client" +msgstr "SSHクライアント" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:70 +msgid "SSH keys, configuration and known hosts" +msgstr "SSHキー、設定、知っているホスト" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:78 +msgid "Pidgin" +msgstr "Pidgin" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:80 +msgid "Pidgin profiles and OTR keyring" +msgstr "PidginのプロファイルとOTRキーホルダー" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:88 +msgid "Claws Mail" +msgstr "Claws Mail" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:90 +msgid "Claws Mail profiles and locally stored email" +msgstr "Claws Mailのプロファイルとローカルに保存された電子メール" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:98 +msgid "GNOME Keyring" +msgstr "GNOMEキーホルダー" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:100 +msgid "Secrets stored by GNOME Keyring" +msgstr "GNOMEキーホルダーによって保存された秘密" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:108 +msgid "Network Connections" +msgstr "ネットワーク接続" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:110 +msgid "Configuration of network devices and connections" +msgstr "ネットワークデバイスと接続の設定" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:118 +msgid "Browser bookmarks" +msgstr "ブラウザのブックマーク" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:120 +msgid "Bookmarks saved in Iceweasel browser" +msgstr "Iceweasel ブラウザーに保存されたブックマーク" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:128 +msgid "APT Packages" +msgstr "APTパッケージ" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:130 +msgid "Packages downloaded by APT" +msgstr "APTがダウンロードしたパッケージ" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:138 +msgid "APT Lists" +msgstr "APTリスト" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:140 +msgid "Lists downloaded by APT" +msgstr "APTがダウンロードしたリスト" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:148 +msgid "Dotfiles" +msgstr "ドットファイル" + +#: ../lib/Tails/Persistence/Configuration/Presets.pm:150 +msgid "" +"Symlink into $HOME every file or directory found in the `dotfiles' directory" +msgstr "`ドットファイル'ディレクトリで見つかった$HOMEの各ファイルかディレクトリへのシンボリックリンク" + +#: ../lib/Tails/Persistence/Setup.pm:259 +msgid "" +"The device Tails is running from cannot be found. Maybe you used the `toram'" +" option?" +msgstr "Tailsが動作しているデバイスを発見出来ませんでした。もしかして`toram' オプションを使ってはいませんか？" + +#: ../lib/Tails/Persistence/Setup.pm:284 +msgid "'Unparseable partition path.'" +msgstr "'解析不可能なパーティションパス。'" + +#: ../lib/Tails/Persistence/Setup.pm:298 +msgid "Setup Tails persistent volume" +msgstr "Talisの永続的ボリュームをセットアップ" + +#: ../lib/Tails/Persistence/Setup.pm:442 +#, perl-format +msgid "Device %s already has a persistent volume." +msgstr "デバイス %s にはすでに永続的ボリュームがあります。" + +#: ../lib/Tails/Persistence/Setup.pm:450 +#, perl-format +msgid "Device %s has not enough unallocated space." +msgstr "デバイス %s には十分な未割り当て領域がありません。" + +#: ../lib/Tails/Persistence/Setup.pm:458 ../lib/Tails/Persistence/Setup.pm:472 +#, perl-format +msgid "Device %s has no persistent volume." +msgstr "デバイス %s には永続的ボリュームがありません。" + +#: ../lib/Tails/Persistence/Setup.pm:464 +msgid "" +"Cannot delete the persistent volume while in use. You should restart Tails " +"without persistence." +msgstr "使用中の間は永続的ボリュームを削除出来ません。永続をオフにしてTailsを再起動すべきです。" + +#: ../lib/Tails/Persistence/Setup.pm:483 +msgid "Persistence volume is not unlocked." +msgstr "永続的ボリュームがアンロックされていません。" + +#: ../lib/Tails/Persistence/Setup.pm:488 +msgid "Persistence volume is not mounted." +msgstr "永続的ボリュームがマウントされていません。" + +#: ../lib/Tails/Persistence/Setup.pm:493 +msgid "Persistence volume is not readable. Permissions or ownership problems?" +msgstr "永続的ボリュームが読み込み可能ではありません。パーミッションや所有権に問題があるかもしれません。" + +#: ../lib/Tails/Persistence/Setup.pm:498 +msgid "Persistence volume is not writable. Maybe it was mounted read-only?" +msgstr "永続的ボリュームが書き込み可能ではありません。リードオンリーでマウントされた可能性があります。" + +#: ../lib/Tails/Persistence/Setup.pm:507 +#, perl-format +msgid "Tails is running from non-USB device %s." +msgstr "Tailsは非USB機器 %sから起動しています。" + +#: ../lib/Tails/Persistence/Setup.pm:513 +#, perl-format +msgid "Device %s is optical." +msgstr "デバイス %sは光学機器です。" + +#: ../lib/Tails/Persistence/Setup.pm:520 +#, perl-format +msgid "Device %s was not created using Tails USB installer." +msgstr "デバイス %sはTails USB installerを用いて作成されませんでした。" + +#: ../lib/Tails/Persistence/Setup.pm:554 +msgid "Error" +msgstr "エラー" + +#: ../lib/Tails/Persistence/Setup.pm:861 +msgid "Persistence wizard - Finished" +msgstr "永続ウィザード -終了" + +#: ../lib/Tails/Persistence/Setup.pm:864 +msgid "" +"Any changes you have made will only take effect after restarting Tails.\n" +"\n" +"You may now close this application." +msgstr "行った変更はTails再起動後まで効果を発揮しません。\n\n現在はこのアプリケーションを閉じても構いません。" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 +msgid "Persistence wizard - Persistent volume creation" +msgstr "永続ウィザード - 永続的ボリューム作成" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 +msgid "Choose a passphrase to protect the persistent volume" +msgstr "永続的ボリュームを保護するためのパスフレーズを選択" + +#. TRANSLATORS: size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 +#, perl-format +msgid "" +"A %s persistent volume will be created on the %s %s device. Data on " +"this volume will be stored in an encrypted form protected by a passphrase." +msgstr "%sの永続的ボリュームは%s %s上に作成されます。このボリュームのデータはパスフレーズによって保護された、暗号化された形式で保存されます。" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 +msgid "Create" +msgstr "作成" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 +msgid "" +"Beware! Using persistence has consequences that must be well " +"understood. Tails can't help you if you use it wrong! See <a " +"href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" +" documentation about persistence</a> to learn more." +msgstr "注意！ 永続の使用はよく理解して置かなければならない重大性があります。Tailsはあなたが間違って使用していても助けることができません！詳細については<a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tailsの永続についてのドキュメント</a>をご覧ください。" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 +msgid "Passphrase:" +msgstr "パスフレーズ:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 +msgid "Verify Passphrase:" +msgstr "パスフレーズ確認:" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 +msgid "Passphrase can't be empty" +msgstr "パスフレーズは空に出来ません" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 +msgid "Passphrases do not match" +msgstr "パスフレーズが一致しません" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 +#: ../lib/Tails/Persistence/Step/Configure.pm:189 +msgid "Failed" +msgstr "失敗しました" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 +#: ../lib/Tails/Persistence/Step/Delete.pm:84 +msgid "Correcting attributes on Tails system partition." +msgstr "Tailsシステムパーティション上の属性を修正中。" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 +#: ../lib/Tails/Persistence/Step/Delete.pm:87 +msgid "The attributes of the Tails system partition will be corrected." +msgstr "Tailsシステムパーティションの属性が修正されます。" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 +msgid "Mounting Tails persistence partition." +msgstr "Tails永続的パーティションをマウント中" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 +msgid "The Tails persistence partition will be mounted." +msgstr "Tails永続的パーティションがマウントされます。" + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 +msgid "Creating..." +msgstr "作成中..." + +#: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 +msgid "Creating the persistent volume..." +msgstr "永続的ボリュームを作成中..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:60 +msgid "Persistence wizard - Persistent volume configuration" +msgstr "永続ウィザード - 永続的ボリューム設定" + +#: ../lib/Tails/Persistence/Step/Configure.pm:63 +msgid "Specify the files that will be saved in the persistent volume" +msgstr "永続的ボリュームで保存されるファイルを明示する" + +#. TRANSLATORS: partition, size, device vendor, device model +#: ../lib/Tails/Persistence/Step/Configure.pm:67 +#, perl-format +msgid "" +"The selected files will be stored in the encrypted partition %s (%s), on the" +" %s %s device." +msgstr "選択したファイルは、%s %sデバイス上の、暗号化されたパーティション %s (%s)に保存されます。" + +#: ../lib/Tails/Persistence/Step/Configure.pm:73 +msgid "Save" +msgstr "保存" + +#: ../lib/Tails/Persistence/Step/Configure.pm:135 +msgid "Make custom directory persistent (absolute path):" +msgstr "カスタム永続的ディレクトリを作成（絶対パス）:" + +#: ../lib/Tails/Persistence/Step/Configure.pm:141 +msgid "Destination:" +msgstr "目的パス:" + +#: ../lib/Tails/Persistence/Step/Configure.pm:204 +msgid "Saving..." +msgstr "保存中..." + +#: ../lib/Tails/Persistence/Step/Configure.pm:207 +msgid "Saving persistence configuration..." +msgstr "永続的設定を保存中..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:41 +msgid "Persistence wizard - Persistent volume deletion" +msgstr "永続ウィザード - 永続的ボリューム削除" + +#: ../lib/Tails/Persistence/Step/Delete.pm:44 +msgid "Your persistent data will be deleted." +msgstr "あなたの永続データが削除されます。" + +#: ../lib/Tails/Persistence/Step/Delete.pm:48 +#, perl-format +msgid "" +"The persistent volume %s (%s), on the %s %s device, will be deleted." +msgstr "永続ボリューム %s (%s) (%s %sデバイス上) は削除されます。" + +#: ../lib/Tails/Persistence/Step/Delete.pm:54 +msgid "Delete" +msgstr "削除" + +#: ../lib/Tails/Persistence/Step/Delete.pm:99 +msgid "Deleting..." +msgstr "削除中..." + +#: ../lib/Tails/Persistence/Step/Delete.pm:102 +msgid "Deleting the persistent volume..." +msgstr "永続的ボリュームを削除中..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 06 Jun '13

06 Jun '13

commit 13efc0df6ab95a65dda3cbda9056b692d9be2c98 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 6 13:46:13 2013 +0000 Update translations for tails-persistence-setup --- ja/ja.po | 82 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index 6d3f617..ab852b7 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-06-06 13:15+0000\n" +"PO-Revision-Date: 2013-06-06 13:30+0000\n" "Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" @@ -76,11 +76,11 @@ msgstr "ネットワークデバイスと接続の設定" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" -msgstr "" +msgstr "ブラウザのブックマーク" #: ../lib/Tails/Persistence/Configuration/Presets.pm:120 msgid "Bookmarks saved in Iceweasel browser" -msgstr "" +msgstr "Iceweasel ブラウザーに保存されたブックマーク" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "APT Packages" @@ -140,38 +140,38 @@ msgstr "デバイス %s には永続的ボリュームがありません。" msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." -msgstr "使用中の間は永続的ボリュームを削除出来ません。永続的ボリュームをオフにしてTailsを再起動すべきです。" +msgstr "使用中の間は永続的ボリュームを削除出来ません。永続をオフにしてTailsを再起動すべきです。" #: ../lib/Tails/Persistence/Setup.pm:483 msgid "Persistence volume is not unlocked." -msgstr "" +msgstr "永続的ボリュームがアンロックされていません。" #: ../lib/Tails/Persistence/Setup.pm:488 msgid "Persistence volume is not mounted." -msgstr "" +msgstr "永続的ボリュームがマウントされていません。" #: ../lib/Tails/Persistence/Setup.pm:493 msgid "Persistence volume is not readable. Permissions or ownership problems?" -msgstr "" +msgstr "永続的ボリュームが読み込み可能ではありません。パーミッションや所有権に問題があるかもしれません。" #: ../lib/Tails/Persistence/Setup.pm:498 msgid "Persistence volume is not writable. Maybe it was mounted read-only?" -msgstr "" +msgstr "永続的ボリュームが書き込み可能ではありません。リードオンリーでマウントされた可能性があります。" #: ../lib/Tails/Persistence/Setup.pm:507 #, perl-format msgid "Tails is running from non-USB device %s." -msgstr "" +msgstr "Tailsは非USB機器 %sから起動しています。" #: ../lib/Tails/Persistence/Setup.pm:513 #, perl-format msgid "Device %s is optical." -msgstr "" +msgstr "デバイス %sは光学機器です。" #: ../lib/Tails/Persistence/Setup.pm:520 #, perl-format msgid "Device %s was not created using Tails USB installer." -msgstr "" +msgstr "デバイス %sはTails USB installerを用いて作成されませんでした。" #: ../lib/Tails/Persistence/Setup.pm:554 msgid "Error" @@ -179,22 +179,22 @@ msgstr "エラー" #: ../lib/Tails/Persistence/Setup.pm:861 msgid "Persistence wizard - Finished" -msgstr "" +msgstr "永続ウィザード -終了" #: ../lib/Tails/Persistence/Setup.pm:864 msgid "" "Any changes you have made will only take effect after restarting Tails.\n" "\n" "You may now close this application." -msgstr "" +msgstr "行った変更はTails再起動後まで効果を発揮しません。\n\n現在はこのアプリケーションを閉じても構いません。" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:54 msgid "Persistence wizard - Persistent volume creation" -msgstr "" +msgstr "永続ウィザード - 永続的ボリューム作成" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:57 msgid "Choose a passphrase to protect the persistent volume" -msgstr "" +msgstr "永続的ボリュームを保護するためのパスフレーズを選択" #. TRANSLATORS: size, device vendor, device model #: ../lib/Tails/Persistence/Step/Bootstrap.pm:61 @@ -202,11 +202,11 @@ msgstr "" msgid "" "A %s persistent volume will be created on the %s %s device. Data on " "this volume will be stored in an encrypted form protected by a passphrase." -msgstr "" +msgstr "%sの永続的ボリュームは%s %s上に作成されます。このボリュームのデータはパスフレーズによって保護された、暗号化された形式で保存されます。" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:66 msgid "Create" -msgstr "" +msgstr "作成" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:110 msgid "" @@ -214,24 +214,24 @@ msgid "" "understood. Tails can't help you if you use it wrong! See <a " "href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tails" " documentation about persistence</a> to learn more." -msgstr "" +msgstr "注意！ 永続の使用はよく理解して置かなければならない重大性があります。Tailsはあなたが間違って使用していても助けることができません！詳細については<a href='file:///usr/share/doc/tails/website/doc/first_steps/persistence.en.html'>Tailsの永続についてのドキュメント</a>をご覧ください。" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:144 msgid "Passphrase:" -msgstr "" +msgstr "パスフレーズ:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:154 msgid "Verify Passphrase:" -msgstr "" +msgstr "パスフレーズ確認:" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:167 #: ../lib/Tails/Persistence/Step/Bootstrap.pm:231 msgid "Passphrase can't be empty" -msgstr "" +msgstr "パスフレーズは空に出来ません" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:222 msgid "Passphrases do not match" -msgstr "" +msgstr "パスフレーズが一致しません" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:262 #: ../lib/Tails/Persistence/Step/Configure.pm:189 @@ -241,36 +241,36 @@ msgstr "失敗しました" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:269 #: ../lib/Tails/Persistence/Step/Delete.pm:84 msgid "Correcting attributes on Tails system partition." -msgstr "" +msgstr "Tailsシステムパーティション上の属性を修正中。" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:272 #: ../lib/Tails/Persistence/Step/Delete.pm:87 msgid "The attributes of the Tails system partition will be corrected." -msgstr "" +msgstr "Tailsシステムパーティションの属性が修正されます。" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:280 msgid "Mounting Tails persistence partition." -msgstr "" +msgstr "Tails永続的パーティションをマウント中" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:283 msgid "The Tails persistence partition will be mounted." -msgstr "" +msgstr "Tails永続的パーティションがマウントされます。" #: ../lib/Tails/Persistence/Step/Bootstrap.pm:304 msgid "Creating..." -msgstr "" +msgstr "作成中..." #: ../lib/Tails/Persistence/Step/Bootstrap.pm:307 msgid "Creating the persistent volume..." -msgstr "" +msgstr "永続的ボリュームを作成中..." #: ../lib/Tails/Persistence/Step/Configure.pm:60 msgid "Persistence wizard - Persistent volume configuration" -msgstr "" +msgstr "永続ウィザード - 永続的ボリューム設定" #: ../lib/Tails/Persistence/Step/Configure.pm:63 msgid "Specify the files that will be saved in the persistent volume" -msgstr "" +msgstr "永続的ボリュームで保存されるファイルを明示する" #. TRANSLATORS: partition, size, device vendor, device model #: ../lib/Tails/Persistence/Step/Configure.pm:67 @@ -278,7 +278,7 @@ msgstr "" msgid "" "The selected files will be stored in the encrypted partition %s (%s), on the" " %s %s device." -msgstr "" +msgstr "選択したファイルは、%s %sデバイス上の、暗号化されたパーティション %s (%s)に保存されます。" #: ../lib/Tails/Persistence/Step/Configure.pm:73 msgid "Save" @@ -286,42 +286,42 @@ msgstr "保存" #: ../lib/Tails/Persistence/Step/Configure.pm:135 msgid "Make custom directory persistent (absolute path):" -msgstr "" +msgstr "カスタム永続的ディレクトリを作成（絶対パス）:" #: ../lib/Tails/Persistence/Step/Configure.pm:141 msgid "Destination:" -msgstr "" +msgstr "目的パス:" #: ../lib/Tails/Persistence/Step/Configure.pm:204 msgid "Saving..." -msgstr "" +msgstr "保存中..." #: ../lib/Tails/Persistence/Step/Configure.pm:207 msgid "Saving persistence configuration..." -msgstr "" +msgstr "永続的設定を保存中..." #: ../lib/Tails/Persistence/Step/Delete.pm:41 msgid "Persistence wizard - Persistent volume deletion" -msgstr "" +msgstr "永続ウィザード - 永続的ボリューム削除" #: ../lib/Tails/Persistence/Step/Delete.pm:44 msgid "Your persistent data will be deleted." -msgstr "" +msgstr "あなたの永続データが削除されます。" #: ../lib/Tails/Persistence/Step/Delete.pm:48 #, perl-format msgid "" "The persistent volume %s (%s), on the %s %s device, will be deleted." -msgstr "" +msgstr "永続ボリューム %s (%s) (%s %sデバイス上) は削除されます。" #: ../lib/Tails/Persistence/Step/Delete.pm:54 msgid "Delete" -msgstr "" +msgstr "削除" #: ../lib/Tails/Persistence/Step/Delete.pm:99 msgid "Deleting..." -msgstr "" +msgstr "削除中..." #: ../lib/Tails/Persistence/Step/Delete.pm:102 msgid "Deleting the persistent volume..." -msgstr "" +msgstr "永続的ボリュームを削除中..."

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 06 Jun '13

06 Jun '13

commit ba0cae4279ce76c54265e8138f4fda399ee4482f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jun 6 13:16:09 2013 +0000 Update translations for tails-persistence-setup --- ja/ja.po | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index cb0f1d1..6d3f617 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-11-27 21:00+0100\n" -"PO-Revision-Date: 2013-06-04 07:36+0000\n" +"PO-Revision-Date: 2013-06-06 13:15+0000\n" "Last-Translator: plazmism <gomidori(a)live.jp>\n" "Language-Team: Japanese (http://www.transifex.com/projects/p/torproject/language/ja/)\n" "MIME-Version: 1.0\n" @@ -48,31 +48,31 @@ msgstr "Pidgin" #: ../lib/Tails/Persistence/Configuration/Presets.pm:80 msgid "Pidgin profiles and OTR keyring" -msgstr "" +msgstr "PidginのプロファイルとOTRキーホルダー" #: ../lib/Tails/Persistence/Configuration/Presets.pm:88 msgid "Claws Mail" -msgstr "" +msgstr "Claws Mail" #: ../lib/Tails/Persistence/Configuration/Presets.pm:90 msgid "Claws Mail profiles and locally stored email" -msgstr "" +msgstr "Claws Mailのプロファイルとローカルに保存された電子メール" #: ../lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "GNOME Keyring" -msgstr "" +msgstr "GNOMEキーホルダー" #: ../lib/Tails/Persistence/Configuration/Presets.pm:100 msgid "Secrets stored by GNOME Keyring" -msgstr "" +msgstr "GNOMEキーホルダーによって保存された秘密" #: ../lib/Tails/Persistence/Configuration/Presets.pm:108 msgid "Network Connections" -msgstr "" +msgstr "ネットワーク接続" #: ../lib/Tails/Persistence/Configuration/Presets.pm:110 msgid "Configuration of network devices and connections" -msgstr "" +msgstr "ネットワークデバイスと接続の設定" #: ../lib/Tails/Persistence/Configuration/Presets.pm:118 msgid "Browser bookmarks" @@ -84,63 +84,63 @@ msgstr "" #: ../lib/Tails/Persistence/Configuration/Presets.pm:128 msgid "APT Packages" -msgstr "" +msgstr "APTパッケージ" #: ../lib/Tails/Persistence/Configuration/Presets.pm:130 msgid "Packages downloaded by APT" -msgstr "" +msgstr "APTがダウンロードしたパッケージ" #: ../lib/Tails/Persistence/Configuration/Presets.pm:138 msgid "APT Lists" -msgstr "" +msgstr "APTリスト" #: ../lib/Tails/Persistence/Configuration/Presets.pm:140 msgid "Lists downloaded by APT" -msgstr "" +msgstr "APTがダウンロードしたリスト" #: ../lib/Tails/Persistence/Configuration/Presets.pm:148 msgid "Dotfiles" -msgstr "" +msgstr "ドットファイル" #: ../lib/Tails/Persistence/Configuration/Presets.pm:150 msgid "" "Symlink into $HOME every file or directory found in the `dotfiles' directory" -msgstr "" +msgstr "`ドットファイル'ディレクトリで見つかった$HOMEの各ファイルかディレクトリへのシンボリックリンク" #: ../lib/Tails/Persistence/Setup.pm:259 msgid "" "The device Tails is running from cannot be found. Maybe you used the `toram'" " option?" -msgstr "" +msgstr "Tailsが動作しているデバイスを発見出来ませんでした。もしかして`toram' オプションを使ってはいませんか？" #: ../lib/Tails/Persistence/Setup.pm:284 msgid "'Unparseable partition path.'" -msgstr "" +msgstr "'解析不可能なパーティションパス。'" #: ../lib/Tails/Persistence/Setup.pm:298 msgid "Setup Tails persistent volume" -msgstr "" +msgstr "Talisの永続的ボリュームをセットアップ" #: ../lib/Tails/Persistence/Setup.pm:442 #, perl-format msgid "Device %s already has a persistent volume." -msgstr "" +msgstr "デバイス %s にはすでに永続的ボリュームがあります。" #: ../lib/Tails/Persistence/Setup.pm:450 #, perl-format msgid "Device %s has not enough unallocated space." -msgstr "" +msgstr "デバイス %s には十分な未割り当て領域がありません。" #: ../lib/Tails/Persistence/Setup.pm:458 ../lib/Tails/Persistence/Setup.pm:472 #, perl-format msgid "Device %s has no persistent volume." -msgstr "" +msgstr "デバイス %s には永続的ボリュームがありません。" #: ../lib/Tails/Persistence/Setup.pm:464 msgid "" "Cannot delete the persistent volume while in use. You should restart Tails " "without persistence." -msgstr "" +msgstr "使用中の間は永続的ボリュームを削除出来ません。永続的ボリュームをオフにしてTailsを再起動すべきです。" #: ../lib/Tails/Persistence/Setup.pm:483 msgid "Persistence volume is not unlocked."

1 0

r26207: {website} Include Scramblesuit in the pluggable transports page. (website/trunk/docs/en)
by George Kadianakis 06 Jun '13

06 Jun '13

Author: asn Date: 2013-06-06 10:33:44 +0000 (Thu, 06 Jun 2013) New Revision: 26207 Modified: website/trunk/docs/en/pluggable-transports.wml Log: Include Scramblesuit in the pluggable transports page. Modified: website/trunk/docs/en/pluggable-transports.wml =================================================================== --- website/trunk/docs/en/pluggable-transports.wml 2013-06-03 02:27:58 UTC (rev 26206) +++ website/trunk/docs/en/pluggable-transports.wml 2013-06-06 10:33:44 UTC (rev 26207) @@ -61,6 +61,15 @@ Status: <a href="https://crypto.stanford.edu/flashproxy/#how-to">Deployed</a> </li> + <li>ScrambleSuit is a pluggable transport that protects + against follow-up probing attacks and is also capable of changing + its network fingerprint (packet length distribution, + inter-arrival times, etc.). It's part of the Obfsproxy framework. See its + <a href="http://www.cs.kau.se/philwint/scramblesuit/">official page</a>. + Maintained by Philipp Winter. + Status: Undeployed + </li> + <li>StegoTorus is an Obfsproxy fork that extends it to a) split Tor streams across multiple connections to avoid packet size signatures, and b) embed the traffic flows in traces that look like

1 0