- tor-commits - lists.torproject.org

[onionperf/master] Add table of contents to README.
by karsten＠torproject.org 18 May '20

18 May '20

commit 854787038cd03d1e433640ea65a50b879b9a370d Author: Philipp Winter <phw(a)nymity.ch> Date: Fri May 15 12:15:56 2020 -0700 Add table of contents to README. --- README.md | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9f7e872..a8a6b72 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,22 @@ For more information, see https://git.torproject.org/onionperf For a dockerized setup, see https://github.com/hiromipaw/onionperf-docker +## Table of contents + +* [Quick deployment instructions](#quick-deployment-instructions) +* [Step-by-step installation instructions](#step-by-step-installation-instructions) + - [Get OnionPerf](#get-onionperf) + - [Install System Dependencies](#install-system-dependencies) + - [Install Python modules](#install-python-modules) + - [Build Tor](#build-tor) + - [Build TGen Traffic Generator](#build-tgen-traffic-generator) + - [Build and Install OnionPerf](#build-and-install-onionperf) +* [Run OnionPerf](#run-onionperf) + - [Measure Tor](#measure-tor) + - [Analyze and Visualize Results](#analyze-and-visualize-results) + - [Troubleshooting](#troubleshooting) +* [Contribute](#contribute) + ## Quick deployment instructions These are the quick deployment instructions for the current Debian stable distribution. @@ -173,7 +189,7 @@ python3 setup.py build python3 setup.py install ``` -### Run OnionPerf +## Run OnionPerf OnionPerf has several modes of operation and a help menu for each. For a description of each mode, use: @@ -241,7 +257,7 @@ specific log files from the `log_rotate` directories. You can also plot the meas results from the `json` files by running in `onionperf visualize` mode. See below for more details. -### Analyze/Visualize Results +### Analyze and Visualize Results OnionPerf runs the data it collects through `analyze` mode every night at midnight to produce the `onionperf.analysis.json` stats file. This file can be reproduced by using @@ -318,6 +334,6 @@ In this particular case tgen-server log file revealed the problem: The log indicated that port 8080 was already in use by another process. -### Contribute +## Contribute GitHub pull requests are welcome and encouraged!

1 0

[onionperf/master] Document the BASETORRC environment variable.
by karsten＠torproject.org 18 May '20

18 May '20

commit bfe5d16e1ae315e8914d6a48225af1aa31f1e16c Author: Philipp Winter <phw(a)nymity.ch> Date: Fri May 15 14:35:49 2020 -0700 Document the BASETORRC environment variable. This fixes <https://bugs.torproject.org/33435>. --- onionperf/docs/onionperf.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/onionperf/docs/onionperf.rst b/onionperf/docs/onionperf.rst index 7070b31..471a29a 100644 --- a/onionperf/docs/onionperf.rst +++ b/onionperf/docs/onionperf.rst @@ -136,6 +136,14 @@ Download files using specified configuration file for the Tor client (default: d --torserver-conf-file FILE +In addition to specifying configuration files, you can pass newline-separated +Tor configuration options to the Tor process by adding them to the +:code:`BASETORRC` environment variable. These options are prepended to all other +configuration options. Here is an example which prepends the options +:code:`Option1 Foo` and :code:`Option2 Bar` to Tor's configuration file: :: + + BASETORRC=$'Option1 Foo\nOption2 Bar' onionperf ... + Download files using specified configuration file for the Tor server (default: disabled) :: --additional-client-conf STRING

1 0

[tor-browser-build/master] Bug 34247: Update and fix errors in README
by gk＠torproject.org 18 May '20

18 May '20

commit 2c48c7178644bc4ba219791ed56e4078ed9e9d18 Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 18 07:22:16 2020 +0000 Bug 34247: Update and fix errors in README --- README | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/README b/README index 8e97e2f..a95f466 100644 --- a/README +++ b/README @@ -5,9 +5,7 @@ Installing build dependencies ----------------------------- To build Tor Browser, you need a Linux distribution that has support -for runc (such as Debian jessie, Ubuntu 16.04, Fedora 20, etc ...). -On Debian jessie, the runc package is available in backports. On Debian -stretch, the runc package is available in the main repository. +for runc (such as Debian Buster, Ubuntu 16.04, Fedora 30, etc ...). Your user account should have sudo access, which is required to be able to extract container file systems, start containers and copy files to and @@ -71,6 +69,7 @@ name to the makefile target: $ make nightly-linux-x86_64 $ make nightly-linux-i686 $ make nightly-windows-i686 + $ make nightly-windows-x86_64 $ make nightly-osx-x86_64 $ make nightly-android-armv7 $ make nightly-android-aarch64 @@ -81,13 +80,15 @@ When you want to quickly do a build to test a change, you can use the testbuild makefile target, and find the build in the testbuild directory. The build will be the same as regular alpha builds, except that in order to make the build faster, only the en-US locale will be built, and no -mar file will be created. +mar file will be created. If you want to base your testbuild on the latest +nightly code insted, rename rbm.local.conf.example to rbm.local.conf +and adapt the torbrowser-testbuild option accordingly. Updating git sources -------------------- -You can run "make fetch" to fetch the latest sources from git for all +You can run `make fetch` to fetch the latest sources from git for all components included in Tor Browser. You should run this if you want to make a nightly build with the latest commits, and you disabled automatic fetching of new commits for nightly builds in rbm.local.conf. @@ -122,14 +123,14 @@ option. You can look at the Makefile to find the rbm command for what you want to build, and add the --output-dir option. For example, if you want to build Tor Browser nightly for linux-x86_64: - ./rbm/rbm build release --output-dir=/var/builds/nightly/2017-01-23 \ + ./rbm/rbm build release --output-dir=/var/builds/nightly/2020-05-23 \ --target nightly --target torbrowser-linux-x86_64 The files will be put in the directory selected by --output-dir in a subdirectory named as the version number (or current date for nightly). To remove this version subdirectory, add the noversiondir target: - ./rbm/rbm build release --output-dir=/var/builds/nightly/2017-01-23 \ + ./rbm/rbm build release --output-dir=/var/builds/nightly/2020-05-23 \ --target nightly --target torbrowser-linux-x86_64 \ --target noversiondir @@ -166,14 +167,14 @@ in the rbm.local.conf file. Cleaning obsolete files and containers images --------------------------------------------- -You can run 'make clean' to clean old build files and containers that +You can run `make clean` to clean old build files and containers that are no longer used in current builds. Before doing that, you need to configure the branches and build targets you are using in the rbm.local.conf file. The cleaning script will check out all the configured branches to create a list of used build files, and delete the files from the 'out' directory that are not used. If you want to see the list of files and containers that would be removed without doing it, you can -use 'make clean-dry-run'. +use `make clean-dry-run`. Building without containers (Android builds only) @@ -181,12 +182,10 @@ Building without containers (Android builds only) By default the build is done inside containers. Adding the no_containers target will disable the use of containers. The following commands can -be used to build the alpha version for android-armv7 and android-x86: +be used to build the alpha version for e.g. android-armv7: ./rbm/rbm build release --target no_containers --target testbuild \ --target torbrowser-android-armv7 - ./rbm/rbm build release --target no_containers --target testbuild \ - --target torbrowser-android-x86 Note: the logs will still show the use and creation of a container image called "containers_disabled". This is due to the way we disable the use @@ -198,7 +197,7 @@ builds, and will require that you run Debian Stretch and install build dependencies for all the components that are built. This can be done with the following command: - # apt-get install build-essential python automake libtool zip unzip + # apt-get install build-essential python automake libtool zip unzip \ autoconf2.13 openjdk-8-jdk gettext-base autotools-dev \ automake autoconf libtool autopoint libssl-dev \ pkg-config zlib1g-dev libparallel-forkmanager-perl \ @@ -218,9 +217,10 @@ Hacking on the Tor Browser build The file README.HACKING tries to list the main things to know when making changes to the Tor Browser build. + Description of makefile rules ----------------------------- -You can find a description of the makefile rules in the README.MAKEFILE +You can find a description of the Makefile rules in the README.MAKEFILE file.

1 0

[translation/donatepages-messagespot] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot
by translation＠torproject.org 18 May '20

18 May '20

commit d04711bbfcc12c91986458d1c4bab14128b34ba1 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 18 09:45:31 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=donatepages-message… --- locale/hu/LC_MESSAGES/messages.po | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/locale/hu/LC_MESSAGES/messages.po b/locale/hu/LC_MESSAGES/messages.po index 96c9d8e8ca..6c8bea4123 100644 --- a/locale/hu/LC_MESSAGES/messages.po +++ b/locale/hu/LC_MESSAGES/messages.po @@ -1,12 +1,13 @@ +# # Translators: # benewfy <benewfy(a)gmail.com>, 2018 -# vargaviktor <viktor.varga(a)gmail.com>, 2019 # erinm, 2019 # István Dávid <istvandavid(a)icloud.com>, 2019 +# vargaviktor <viktor.varga(a)gmail.com>, 2020 # msgid "" msgstr "" -"Last-Translator: István Dávid <istvandavid(a)icloud.com>, 2019\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>, 2020\n" "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n" "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -162,7 +163,7 @@ msgstr "" #: tmp/cache_locale/17/179dc1a0f488d5bbb8c128dc5c0fb35d6240d83414df10335a1cf4031139609a.php:183 #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:656 msgid "Back to Donate Page" -msgstr "" +msgstr "Vissza a támogatás oldalra" #: tmp/cache_locale/ef/ef5649de7f8cead2eb5ba30c5d2afbe4e1ea84df12773fd2513ca8f8823e3fbc.php:35 #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:54 @@ -300,12 +301,12 @@ msgstr "XXL" #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:47 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:70 msgid "Privacy and freedom online should be the default." -msgstr "" +msgstr "Az adatvédelem és az online szabadság kellene legyen az alap." #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:49 #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:72 msgid "Donate to the Tor Project." -msgstr "" +msgstr "Támogassa a Tor Projectet." #: tmp/cache_locale/dd/ddde851dcf0f4bcfdf69b2fb2bdd731c4f85ce373ca3ec850a7ca8bbc00dfb85.php:58 #: tmp/cache_locale/66/666e9197f427d70c0743bcdae2c3e34f41f9d7acf2b2dddb2c21c21723e73d10.php:63 @@ -329,7 +330,7 @@ msgstr "Támogatás wallet címet használva" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:166 msgid "Copied" -msgstr "" +msgstr "Másolva" #: tmp/cache_locale/cc/cc2e1dd4edb96c59a6514d676ca3f562a2a9a2cd34e2c211c03fb08b3e664469.php:170 msgid "Currency Amount must be a number."

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 18 May '20

18 May '20

commit aef3ba24d3de7ee03edad8153b72691b89eaa306 Author: Translation commit bot <translation(a)torproject.org> Date: Mon May 18 08:45:13 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- hu/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po index ab45e2c952..04c8181230 100644 --- a/hu/LC_MESSAGES/bridgedb.po +++ b/hu/LC_MESSAGES/bridgedb.po @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-16 09:14+0000\n" +"PO-Revision-Date: 2020-05-18 08:40+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" @@ -97,7 +97,7 @@ msgstr "Ez a QR Kód a híd sorait tartalmazza. Olvassa be egy QR Kód olvasóva #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "A BridgeDB hibára futott." #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..."

1 0

[chutney/master] Tornet: Remove extraneous whitespace
by nickm＠torproject.org 18 May '20

18 May '20

commit cf639392caa4293ba5334f3743f0189cd4bf5cb2 Author: c <c(a)chroniko.jp> Date: Sat Apr 18 10:32:02 2020 +0000 Tornet: Remove extraneous whitespace --- lib/chutney/TorNet.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 4a5a8bc..1ec7061 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -536,7 +536,6 @@ class NodeBuilder(_NodeCommon): """Called on each nodes after all nodes configure.""" raise NotImplementedError() - def isSupported(self, net): """Return true if this node appears to have everything it needs; false otherwise."""

1 0

[chutney/master] TorNet: Raise error if methods not implemented
by nickm＠torproject.org 18 May '20

18 May '20

commit 6b5dda7cc869b30b5056965a077e0fa1b12350b9 Author: c <c(a)chroniko.jp> Date: Sat Apr 18 10:25:32 2020 +0000 TorNet: Raise error if methods not implemented In NodeController and NodeBuilder abstract base classes, make it clearer which methods to override and give runtime errors if these are called and not overriden. --- lib/chutney/TorNet.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index b68b240..4a5a8bc 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -520,22 +520,27 @@ class NodeBuilder(_NodeCommon): def checkConfig(self, net): """Try to format our torrc; raise an exception if we can't. """ + raise NotImplementedError() def preConfig(self, net): """Called on all nodes before any nodes configure: generates keys as needed. """ + raise NotImplementedError() def config(self, net): """Called to configure a node: creates a torrc file for it.""" + raise NotImplementedError() def postConfig(self, net): """Called on each nodes after all nodes configure.""" + raise NotImplementedError() def isSupported(self, net): """Return true if this node appears to have everything it needs; false otherwise.""" + raise NotImplementedError() class NodeController(_NodeCommon): @@ -558,9 +563,11 @@ class NodeController(_NodeCommon): def start(self): """Try to start this node; return True if we succeeded or it was already running, False if we failed.""" + raise NotImplementedError() def stop(self, sig=signal.SIGINT): """Try to stop this node by sending it the signal 'sig'.""" + raise NotImplementedError() class LocalNodeBuilder(NodeBuilder):

1 0

[chutney/master] TorNet: Add some missing code documentation
by nickm＠torproject.org 18 May '20

18 May '20

commit 6201b1bde39500b1fae7bb9e547137b6186fa2e8 Author: c <c(a)chroniko.jp> Date: Fri Apr 24 11:41:35 2020 +0000 TorNet: Add some missing code documentation Leave Node.specialize() uncommented because I don't know what this does yet (it looks unused) but document other interfaces where necessary and clean up comments. --- lib/chutney/TorNet.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 1ec7061..b5f238a 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -433,6 +433,8 @@ class Node(object): self._controller = None def getN(self, N): + """Generate 'N' nodes of the same configuration as this node. + """ return [Node(self) for _ in range(N)] def specialize(self, **kwargs): @@ -1110,6 +1112,7 @@ class LocalNodeController(NodeController): os.kill(pid, sig) def cleanup_lockfile(self): + """Remove lock file if this node is no longer running.""" lf = self._env['lockfile'] if not self.isRunning() and os.path.exists(lf): debug("Removing stale lock file for {} ..." @@ -1117,11 +1120,13 @@ class LocalNodeController(NodeController): os.remove(lf) def cleanup_pidfile(self): + """Move PID file to pidfile.old if this node is no longer running + so that we don't try to stop the node again. + """ pidfile = self._env['pidfile'] if not self.isRunning() and os.path.exists(pidfile): debug("Renaming stale pid file for {} ..." .format(self._env['nick'])) - # Move the pidfile, so that we don't try to stop the process again os.rename(pidfile, pidfile + ".old") def waitOnLaunch(self): @@ -2137,6 +2142,9 @@ class Network(object): b.postConfig(network) def status(self): + """Print how many nodes are running and how many are expected, and + return True if all nodes are running. + """ statuses = [n.getController().check(listNonRunning=True) for n in self._nodes] n_ok = len([x for x in statuses if x]) @@ -2144,10 +2152,12 @@ class Network(object): return n_ok == len(self._nodes) def restart(self): + """Stop and subsequently start our network's nodes.""" self.stop() self.start() def start(self): + """Start all our network's nodes and return True on no errors.""" # format polling correctly - avoid printing a newline sys.stdout.write("Starting nodes") sys.stdout.flush() @@ -2161,6 +2171,9 @@ class Network(object): return rv def hup(self): + """Send SIGHUP to all our network's running nodes and return True on no + errors. + """ print("Sending SIGHUP to nodes") return all([n.getController().hup() for n in self._nodes]) @@ -2397,6 +2410,7 @@ class Network(object): c.cleanup_pidfile() def stop(self): + """Stop our network's running tor nodes.""" any_tor_was_running = False controllers = [n.getController() for n in self._nodes] for sig, desc in [(signal.SIGINT, "SIGINT"), @@ -2501,6 +2515,7 @@ def runConfigFile(verb, data): def parseArgs(): + """Parse and return commandline arguments.""" if len(sys.argv) < 3: exit_on_error("Not enough arguments given.") if not os.path.isfile(sys.argv[2]):

1 0

[chutney/master] Merge remote-tracking branch 'tor-github/pr/70'
by nickm＠torproject.org 18 May '20

18 May '20

commit 65f4b3018cfac1405e59a8cf01cc20551f3b8416 Merge: bb4e5f6 2f0e34e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun May 17 20:05:27 2020 -0400 Merge remote-tracking branch 'tor-github/pr/70' lib/chutney/TorNet.py | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-)

1 0

[chutney/master] TorNet: make commandline invocations clear
by nickm＠torproject.org 18 May '20

18 May '20

commit 2f0e34e465b929d3d592afca6c38f2dcc8b81a1e Author: c <c(a)chroniko.jp> Date: Sun May 17 01:17:53 2020 +0000 TorNet: make commandline invocations clear Analysis tools such as vulture treat functions configure, restart, and wait_for_bootstrap in Network as unused, when in reality they are called from the ./chutney commandline. Make this explicitly clear. --- lib/chutney/TorNet.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index b5f238a..cd9a9ec 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -2112,6 +2112,9 @@ class Network(object): sys.exit(1) def configure(self): + """Invoked from command line: Configure and prepare the network to be + started. + """ phase = self._dfltEnv['CUR_CONFIG_PHASE'] if phase == 1: self.create_new_nodes_dir() @@ -2152,7 +2155,9 @@ class Network(object): return n_ok == len(self._nodes) def restart(self): - """Stop and subsequently start our network's nodes.""" + """Invoked from command line: Stop and subsequently start our + network's nodes. + """ self.stop() self.start() @@ -2247,6 +2252,9 @@ class Network(object): CHECKS_PER_PRINT = PRINT_NETWORK_STATUS_DELAY / CHECK_NETWORK_STATUS_DELAY def wait_for_bootstrap(self): + """Invoked from tools/test-network.sh to wait for the network to + bootstrap. + """ print("Waiting for nodes to bootstrap...\n") start = time.time() limit = start + getenv_int("CHUTNEY_START_TIME", 60)

1 0