tor-commits August 2017

tor-commits@lists.torproject.org

17 participants
1132 discussions

[stem/master] Add unit test for data causing issues for BridgeDB
by atagar＠torproject.org 15 Aug '17

15 Aug '17

commit 30990ab8b6374ce2a52a60e7345f96aaebd74263 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 15 13:13:15 2017 -0700 Add unit test for data causing issues for BridgeDB Huh. Became curious if the data causing BridgeDB to be sad was coming from us... https://trac.torproject.org/projects/tor/ticket/23251 Looks to work just fine. --- test/unit/descriptor/networkstatus/document_v3.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/test/unit/descriptor/networkstatus/document_v3.py b/test/unit/descriptor/networkstatus/document_v3.py index 8c662a3e..a99d76be 100644 --- a/test/unit/descriptor/networkstatus/document_v3.py +++ b/test/unit/descriptor/networkstatus/document_v3.py @@ -786,6 +786,17 @@ DnN5aFtYKiTc19qIC7Nmo+afPdDEf0MlJvEOP5EWl3w= ('fast-speed=40960', {str_type('fast-speed'): 40960}), # numeric value ('guard-wfu=94.669%', {str_type('guard-wfu'): 0.94669}), # percentage value ('guard-wfu=94.669% guard-tk=691200', {str_type('guard-wfu'): 0.94669, str_type('guard-tk'): 691200}), # multiple values + ('stable-uptime=0 stable-mtbf=0 fast-speed=0 guard-wfu=0.000% guard-tk=0 guard-bw-inc-exits=0 guard-bw-exc-exits=0 enough-mtbf=1 ignoring-advertised-bws=0', { + str_type('stable-uptime'): 0, + str_type('stable-mtbf'): 0, + str_type('fast-speed'): 0, + str_type('guard-wfu'): 0.0, + str_type('guard-tk'): 0, + str_type('guard-bw-inc-exits'): 0, + str_type('guard-bw-exc-exits'): 0, + str_type('enough-mtbf'): 1, + str_type('ignoring-advertised-bws'): 0, + }), ) for test_value, expected_value in test_values:

1 0

[nyx/master] Allow boxes to expand past screen bounds
by atagar＠torproject.org 15 Aug '17

15 Aug '17

commit 19abc43cf3b5067f2de045c79e79452e7e2f2ab6 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 15 10:28:37 2017 -0700 Allow boxes to expand past screen bounds Any time we drew a box the maximum bounds only went up to the screen edge. This caused the bounding box for dates to always show a bottom border, even if there were more lines. --- nyx/curses.py | 8 ++++---- nyx/panel/log.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 3670629..cb47bb6 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -819,11 +819,11 @@ class _Subwindow(object): :param list attr: text attributes to apply """ - max_width = self.width - left - max_height = self.height - top + if width is None: + width = self.width - left - width = max_width if width is None else min(width, max_width) - height = max_height if height is None else min(height, max_height) + if height is None: + height = self.height - top self.hline(left + 1, top, width - 2, *attr) # top self.hline(left + 1, top + height - 1, width - 2, *attr) # bottom diff --git a/nyx/panel/log.py b/nyx/panel/log.py index be3b8c0..d364470 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -385,7 +385,7 @@ def _draw_entries(subwindow, x, y, event_log, show_duplicates): for entry in day_to_entries[day]: y = _draw_entry(subwindow, x + 1, y, subwindow.width - 1, entry, show_duplicates) - subwindow.box(x, original_y, subwindow.width - x + 2, y - original_y + 1, YELLOW, BOLD) + subwindow.box(x, original_y, subwindow.width - x, y - original_y + 1, YELLOW, BOLD) time_label = time.strftime(' %B %d, %Y ', time.localtime(day_to_entries[day][0].timestamp)) subwindow.addstr(x + 2, original_y, time_label, YELLOW, BOLD)

1 0

[tor-messenger-build/master] Update Makefile for tor-messenger-release
by sukhbir＠torproject.org 15 Aug '17

15 Aug '17

commit 73e2a43a7b396a2fd29965b8261bf7498046f5cc Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Aug 15 12:55:36 2017 -0400 Update Makefile for tor-messenger-release --- Makefile | 2 +- projects/tor-messenger-release/build | 23 ++++++++++++++++ projects/tor-messenger-release/config | 49 +++++++++++++++++++---------------- 3 files changed, 51 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index d76b0ac..cdef67c 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ all: tor-messenger tor-messenger: tor-messenger-linux-x86_64 tor-messenger-linux-i686 tor-messenger-windows-i686 tor-messenger-osx-x86_64 tor-messenger-release: submodule-update - $(rbm) build tor-messenger-release + $(rbm) build tor-messenger-release --target tormessenger-all tor-mail: tor-mail-linux-x86_64 tor-mail-linux-i686 diff --git a/projects/tor-messenger-release/build b/projects/tor-messenger-release/build new file mode 100644 index 0000000..993845f --- /dev/null +++ b/projects/tor-messenger-release/build @@ -0,0 +1,23 @@ +#!/bin/sh +[% c("var/set_default_env") -%] +[% IF ENV.HOME %]export HOME="[% ENV.HOME %]"[% END %] +destdir="[% dest_dir _ '/' _ c("version") %]" +mkdir -p "$destdir" +[% IF c("var/tormessenger-windows-i686") -%] +mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ +[% END -%] +[% IF c("var/tormessenger-osx-x86_64") -%] +mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ +[% END -%] +[% IF c("var/tormessenger-linux-i686") -%] +mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ +[% END -%] +[% IF c("var/tormessenger-linux-x86_64") -%] +mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ +[% END -%] +cd "$destdir" +sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar *.zip | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt +[% IF c("var/sign_build") -%] +gpg -abs [% c("var/sign_build_gpg_opts") %] sha256sums-unsigned-build.txt +[% END -%] +cat sha256sums-unsigned-build.txt diff --git a/projects/tor-messenger-release/config b/projects/tor-messenger-release/config index 2258d3c..d1ce6ac 100644 --- a/projects/tor-messenger-release/config +++ b/projects/tor-messenger-release/config @@ -2,42 +2,47 @@ version: '[% c("var/tormessenger_version") %]' output_dir: 'release' +targets: + tormessenger-all: + - tormessenger-linux-x86_64 + - tormessenger-linux-i686 + - tormessenger-windows-i686 + - tormessenger-osx-x86_64 + tormessenger-linux-x86_64: + var: + tormessenger-linux-x86_64: 1 + tormessenger-linux-i686: + var: + tormessenger-linux-i686: 1 + tormessenger-windows-i686: + var: + tormessenger-windows-i686: 1 + tormessenger-osx-x86_64: + var: + tormessenger-osx-x86_64: 1 + input_files: - name: linux-x86_64 project: tor-messenger + enable: '[% c("var/tormessenger-linux-x86_64") %]' target: - - tor-messenger - - linux-x86_64 + - tormessenger-linux-x86_64 - name: linux-i686 project: tor-messenger + enable: '[% c("var/tormessenger-linux-x86_64") %]' target: - - tor-messenger - - linux-i686 + - tormessenger-linux-i686 - name: windows-i686 project: tor-messenger + enable: '[% c("var/tormessenger-windows-i686") %]' target: - - tor-messenger - - windows-i686 + - tormessenger-windows-i686 - name: osx-x86_64 project: tor-messenger + enable: '[% c("var/tormessenger-osx-x86_64") %]' target: - - tor-messenger - - osx-x86_64 - -build: | - #!/bin/sh - set -e - export LC_ALL=C - destdir="[% dest_dir _ '/' _ c("version") %]" - mkdir -p "$destdir" - mv [% c('input_files_by_name/windows-i686') %]/* "$destdir"/ - mv [% c('input_files_by_name/osx-x86_64') %]/* "$destdir"/ - mv [% c('input_files_by_name/linux-i686') %]/* "$destdir"/ - mv [% c('input_files_by_name/linux-x86_64') %]/* "$destdir"/ - cd "$destdir" - sha256sum $(ls -1 *.exe *.tar.xz *.dmg *.mar | grep -v '\.incremental\.mar$' | sort) > sha256sums-unsigned-build.txt - cat sha256sums-unsigned-build.txt + - tormessenger-osx-x86_64

1 0

[nyx/master] Fix log's date dividers
by atagar＠torproject.org 15 Aug '17

15 Aug '17

commit f974afccdde9216aedb649899da7932d11626fa4 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 15 09:21:37 2017 -0700 Fix log's date dividers Our date bounding box was placed in the completely wrong spot (inverted x/y coordinates), and the side border vanished in the top wasn't visible. --- nyx/curses.py | 4 ++-- nyx/panel/log.py | 10 +++++----- test/panel/log.py | 48 +++++++++++++++++++++++++----------------------- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index 2cb1b42..3670629 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -905,14 +905,14 @@ class _Subwindow(object): def hline(self, x, y, length, *attr): if self.width > x and self.height > y: try: - self._curses_subwindow.hline(y, x, curses.ACS_HLINE | curses_attr(*attr), min(length, self.width - x)) + self._curses_subwindow.hline(max(0, y), max(0, x), curses.ACS_HLINE | curses_attr(*attr), min(length, self.width - x)) except: pass def vline(self, x, y, length, *attr): if self.width > x and self.height > y: try: - self._curses_subwindow.vline(y, x, curses.ACS_VLINE | curses_attr(*attr), min(length, self.height - y)) + self._curses_subwindow.vline(max(0, y), max(0, x), curses.ACS_VLINE | curses_attr(*attr), min(length, self.height - y)) except: pass diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 2c93226..be3b8c0 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -276,7 +276,7 @@ class LogPanel(nyx.panel.DaemonPanel): if is_scrollbar_visible: subwindow.scrollbar(1, scroll, last_content_height) - x, y = 3 if is_scrollbar_visible else 1, 1 - scroll + x, y = 2 if is_scrollbar_visible else 0, 1 - scroll y = _draw_entries(subwindow, x, y, event_log, show_duplicates) # drawing the title after the content, so we'll clear content from the top line @@ -378,16 +378,16 @@ def _draw_entries(subwindow, x, y, event_log, show_duplicates): for day in sorted(day_to_entries.keys(), reverse = True): if day == today: for entry in day_to_entries[day]: - y = _draw_entry(subwindow, x, y, subwindow.width, entry, show_duplicates) + y = _draw_entry(subwindow, x + 1, y, subwindow.width, entry, show_duplicates) else: original_y, y = y, y + 1 for entry in day_to_entries[day]: - y = _draw_entry(subwindow, x, y, subwindow.width - 1, entry, show_duplicates) + y = _draw_entry(subwindow, x + 1, y, subwindow.width - 1, entry, show_duplicates) - subwindow.box(original_y, x - 1, subwindow.width - x + 1, y - original_y + 1, YELLOW, BOLD) + subwindow.box(x, original_y, subwindow.width - x + 2, y - original_y + 1, YELLOW, BOLD) time_label = time.strftime(' %B %d, %Y ', time.localtime(day_to_entries[day][0].timestamp)) - subwindow.addstr(x + 1, original_y, time_label, YELLOW, BOLD) + subwindow.addstr(x + 2, original_y, time_label, YELLOW, BOLD) y += 1 diff --git a/test/panel/log.py b/test/panel/log.py index 4610bff..95d7e9d 100644 --- a/test/panel/log.py +++ b/test/panel/log.py @@ -19,32 +19,34 @@ EXPECTED_WRAPPED_MSG = """\ """.rstrip() EXPECTED_ENTRIES = """\ -16:41:37 [NYX_WARNING] Tor's geoip database is unavailable. -16:41:37 [NYX_NOTICE] No nyxrc loaded, using defaults. You can customize nyx by - placing a configuration file at /home/atagar/.nyx/nyxrc (see the nyxrc.sample - for its options). -16:41:37 [NOTICE] New control connection opened from 127.0.0.1. -16:41:37 [NOTICE] Opening OR listener on 0.0.0.0:7000 -16:41:37 [NOTICE] Opening Control listener on 127.0.0.1:9051 -16:41:37 [NOTICE] Opening Socks listener on 127.0.0.1:9050 -16:41:37 [NOTICE] Tor v0.2.9.0-alpha-dev (git-44ea3dc3311564a9) running on Linux - with Libevent 2.0.16-stable, OpenSSL 1.0.1 and Zlib 1.2.3.4. -16:41:37 [NOTICE] Tor 0.2.9.0-alpha-dev (git-44ea3dc3311564a9) opening log file. + 16:41:37 [NYX_WARNING] Tor's geoip database is unavailable. + 16:41:37 [NYX_NOTICE] No nyxrc loaded, using defaults. You can customize nyx by + placing a configuration file at /home/atagar/.nyx/nyxrc (see the nyxrc.sample + for its options). + 16:41:37 [NOTICE] New control connection opened from 127.0.0.1. + 16:41:37 [NOTICE] Opening OR listener on 0.0.0.0:7000 + 16:41:37 [NOTICE] Opening Control listener on 127.0.0.1:9051 + 16:41:37 [NOTICE] Opening Socks listener on 127.0.0.1:9050 + 16:41:37 [NOTICE] Tor v0.2.9.0-alpha-dev (git-44ea3dc3311564a9) running on + Linux with Libevent 2.0.16-stable, OpenSSL 1.0.1 and Zlib 1.2.3.4. + 16:41:37 [NOTICE] Tor 0.2.9.0-alpha-dev (git-44ea3dc3311564a9) opening log + file. """.rstrip() EXPECTED_ENTRIES_WITH_BORDER = """\ -|October 26, 2011 | -|6:41:37 [NYX_WARNING] Tor's geoip database is unavailable. | -|6:41:37 [NYX_NOTICE] No nyxrc loaded, using defaults. You can customize nyx by| -| placing a configuration file at /home/atagar/.nyx/nyxrc (see the nyxrc.sample| -| for its options). | -|6:41:37 [NOTICE] New control connection opened from 127.0.0.1. | -|6:41:37 [NOTICE] Opening OR listener on 0.0.0.0:7000 | -|6:41:37 [NOTICE] Opening Control listener on 127.0.0.1:9051 | -|6:41:37 [NOTICE] Opening Socks listener on 127.0.0.1:9050 | -|6:41:37 [NOTICE] Tor v0.2.9.0-alpha-dev (git-44ea3dc3311564a9) running on | -| Linux with Libevent 2.0.16-stable, OpenSSL 1.0.1 and Zlib 1.2.3.4. | -|6:41:37 [NOTICE] Tor 0.2.9.0-alpha-dev (git-44ea3dc3311564a9) opening log | ++-October 26, 2011-------------------------------------------------------------+ +|16:41:37 [NYX_WARNING] Tor's geoip database is unavailable. | +|16:41:37 [NYX_NOTICE] No nyxrc loaded, using defaults. You can customize nyx | +| by placing a configuration file at /home/atagar/.nyx/nyxrc (see the | +| nyxrc.sample for its options). | +|16:41:37 [NOTICE] New control connection opened from 127.0.0.1. | +|16:41:37 [NOTICE] Opening OR listener on 0.0.0.0:7000 | +|16:41:37 [NOTICE] Opening Control listener on 127.0.0.1:9051 | +|16:41:37 [NOTICE] Opening Socks listener on 127.0.0.1:9050 | +|16:41:37 [NOTICE] Tor v0.2.9.0-alpha-dev (git-44ea3dc3311564a9) running on | +| Linux with Libevent 2.0.16-stable, OpenSSL 1.0.1 and Zlib 1.2.3.4. | +|16:41:37 [NOTICE] Tor 0.2.9.0-alpha-dev (git-44ea3dc3311564a9) opening log | +| file. | +------------------------------------------------------------------------------+ """.rstrip()

1 0

[tor-browser-build/master] Add a README.MAKEFILE file to describe makefile rules
by boklm＠torproject.org 15 Aug '17

15 Aug '17

commit f291e750afda75d68ba29bbcb998fba67e3f8012 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Aug 15 13:22:39 2017 +0200 Add a README.MAKEFILE file to describe makefile rules --- README | 6 +++++ README.MAKEFILE | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/README b/README index 751ccdd..de79d35 100644 --- a/README +++ b/README @@ -212,3 +212,9 @@ 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 +file. + diff --git a/README.MAKEFILE b/README.MAKEFILE new file mode 100644 index 0000000..ef33904 --- /dev/null +++ b/README.MAKEFILE @@ -0,0 +1,79 @@ +Description of makefile rules +============================= + + +release +------- +Build Tor Browser for the release channel, for all supported platforms. +The resulting build can be found in directory release/$version. + +release-{linux-x86_64,linux-i686,windows-i686,osx-x86_64} +--------------------------------------------------------- +Same as release, for the selected platform only. + +alpha +----- +Build Tor Browser for the alpha channel, for all supported platforms. +The resulting build can be found in directoryp alpha/$version. + +alpha-{linux-x86_64,linux-i686,windows-i686,osx-x86_64} +------------------------------------------------------- +Same as alpha, for the selected platform only. + +nightly +------- +Build Tor Browser for the nightly channel, for all supported platforms. +Many of the components will be based on the master branch. You might +want to run "make fetch" before, to fetch the latest commits from all +components. + +The resulting build can be found in directory nightly/$date + +nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64} +--------------------------------------------------------- +Same as nightly, for the selected platform only. + +alpha_nightly +------------- +Build Tor Browser for the alpha channel, for all supported platforms. +This is the same as 'make alpha', but the output directory is different. +The resulting build can be found in directory alpha_nightly/$date + +alpha_nightly-{linux-x86_64,linux-i686,windows-i686,osx-x86_64} +--------------------------------------------------------------- +The same as alpha_nightly, for the selected platform only. + +testbuild +--------- +Build a Tor Browser test build. To make the build faster, only the en-US +locale is created, without mar files. By default it is based on the +alpha channel, but you can change that by editing rbm.conf.local. +The resulting build can be found in directory testbuild. + +fetch +----- +Fetch new commits from all components. This is useful when you want to +build the nightly channel. + +clean +----- +Clean files created during previous builds that are no longer used in +current builds. Before using this command, you first need to configure +in rbm.local.conf the channel(s) that you are building. + +In other software, the clean rule is used to remove all build files, +but this is not the case here, where only obsolete build files are +removed. It is usually not necessary to remove all build files before +starting a new build as the need for rebuilding components is detected +automatically. If you want to remove all build files, you can remove +the out/ directory. + +clean-dry-run +------------- +Print the files that would be removed when running 'make clean'. + +signtag-{release,alpha} +----------------------- +Create a git signed tag for the selected channel, using the version and +build number defined as var/torbrowser_version and var/torbrowser_build. +

1 0

[metrics-lib/master] Fix javadoc in Descriptor.
by karsten＠torproject.org 15 Aug '17

15 Aug '17

commit e0aa5eb81daa6d22d542cf24cce34081247174b6 Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Jul 28 07:53:31 2017 +0000 Fix javadoc in Descriptor. --- src/main/java/org/torproject/descriptor/Descriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/Descriptor.java b/src/main/java/org/torproject/descriptor/Descriptor.java index ca2a4cf..35ef38b 100644 --- a/src/main/java/org/torproject/descriptor/Descriptor.java +++ b/src/main/java/org/torproject/descriptor/Descriptor.java @@ -53,7 +53,7 @@ public interface Descriptor { * empty list if there were no unrecognized lines. * * <p>Some implementations might not support this operation and will throw an - * {@code UnsupportedOperationException}, * e.g., + * {@code UnsupportedOperationException}, e.g., * {@link UnparseableDescriptor}.</p> * * @since 1.0.0

1 0

[metrics-lib/master] Move FileType and add PLAIN FileType for no compression.
by karsten＠torproject.org 15 Aug '17

15 Aug '17

commit 4ee320caeace98776e7bd51f054df7641b7c3eb1 Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Jul 28 07:53:30 2017 +0000 Move FileType and add PLAIN FileType for no compression. --- .../org/torproject/descriptor/index/IndexNode.java | 2 ++ .../descriptor/{index => internal}/FileType.java | 24 ++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/index/IndexNode.java b/src/main/java/org/torproject/descriptor/index/IndexNode.java index c7a79a0..516bbdf 100644 --- a/src/main/java/org/torproject/descriptor/index/IndexNode.java +++ b/src/main/java/org/torproject/descriptor/index/IndexNode.java @@ -3,6 +3,8 @@ package org.torproject.descriptor.index; +import org.torproject.descriptor.internal.FileType; + import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.annotations.Expose; diff --git a/src/main/java/org/torproject/descriptor/index/FileType.java b/src/main/java/org/torproject/descriptor/internal/FileType.java similarity index 69% rename from src/main/java/org/torproject/descriptor/index/FileType.java rename to src/main/java/org/torproject/descriptor/internal/FileType.java index 9bb7e5f..47bbd28 100644 --- a/src/main/java/org/torproject/descriptor/index/FileType.java +++ b/src/main/java/org/torproject/descriptor/internal/FileType.java @@ -1,7 +1,7 @@ /* Copyright 2016--2017 The Tor Project * See LICENSE for licensing information */ -package org.torproject.descriptor.index; +package org.torproject.descriptor.internal; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorInputStream; import org.apache.commons.compress.compressors.bzip2.BZip2CompressorOutputStream; @@ -16,14 +16,20 @@ import java.io.InputStream; import java.io.OutputStream; /** - * A file type enum provides all compression functionality. + * These enums provide compression functionality. + * + * <p>{@link #findType} determines the compression type by the given extension. + * Compression can also be zero-compression, which is currently provided by + * the PLAIN and JSON enums.</p> * * @since 1.4.0 */ public enum FileType { + BZ2(BZip2CompressorInputStream.class, BZip2CompressorOutputStream.class), GZ(GzipCompressorInputStream.class, GzipCompressorOutputStream.class), JSON(BufferedInputStream.class, BufferedOutputStream.class), + PLAIN(BufferedInputStream.class, BufferedOutputStream.class), XZ(XZCompressorInputStream.class, XZCompressorOutputStream.class); private final Class<? extends InputStream> inClass; @@ -34,6 +40,20 @@ public enum FileType { this.outClass = out; } + /** + * Returns <code>valueOf</code> or the default enum {@link #PLAIN}, i.e., + * this method doesn't throw any exceptions and allways returns a valid enum. + */ + public static FileType findType(String ext) { + FileType res = null; + try { + res = FileType.valueOf(ext.toUpperCase()); + return res; + } catch (IllegalArgumentException | NullPointerException re) { + return PLAIN; + } + } + /** Return the appropriate input stream. */ public InputStream inputStream(InputStream is) throws Exception { return this.inClass.getConstructor(new Class[]{InputStream.class})

1 0

[metrics-web/master] Update news.json to version 115 of doc/MetricsTimeline.
by karsten＠torproject.org 15 Aug '17

15 Aug '17

commit 13952b1a084390fe37a0398e5556043da18ce483 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 15 09:11:10 2017 +0200 Update news.json to version 115 of doc/MetricsTimeline. --- website/src/main/resources/etc/news.json | 113 +++++++++++++++++++++++++++++-- 1 file changed, 107 insertions(+), 6 deletions(-) diff --git a/website/src/main/resources/etc/news.json b/website/src/main/resources/etc/news.json index 841495a..32414b0 100644 --- a/website/src/main/resources/etc/news.json +++ b/website/src/main/resources/etc/news.json @@ -433,6 +433,16 @@ ] }, { + "start": "2017-01-24", + "protocols": [ + "snowflake" + ], + "description": "Tor Browser 7.0a1 released, including Snowflake for GNU/Linux only.", + "links": [ + "<a href=\"https://blog.torproject.org/blog/tor-browser-70a1-released\">blog post</a>" + ] + }, + { "start": "2017-02-10", "protocols": [ "<OR>", @@ -639,6 +649,16 @@ ] }, { + "start": "2017-08-08", + "protocols": [ + "snowflake" + ], + "description": "Tor Browser 7.5a4 released, including Snowflake for macOS.", + "links": [ + "<a href=\"https://blog.torproject.org/blog/tor-browser-75a4-released\">blog post</a>" + ] + }, + { "start": "2016-02-24", "place": "tm", "protocols": [ @@ -756,14 +776,15 @@ }, { "start": "2017-02-06", + "end": "2017-08-01", "place": "ae", "protocols": [ "obfs3" ], - "description": "Increase in obfs3 users from the UAE, from 5K to 75K. Other transports and countries not affected.", + "description": "Increase in obfs3 users from the UAE, from 5K to 100K. Other transports not affected.", "links": [ - "<a href=\"https://metrics.torproject.org/userstats-bridge-transport.html?start=2017-0…">transport graph</a>", - "<a href=\"https://metrics.torproject.org/userstats-bridge-country.html?start=2016-11-…">UAE bridge graph</a>", + "<a href=\"https://metrics.torproject.org/userstats-bridge-transport.html?start=2017-0…">transport graph</a>", + "<a href=\"https://metrics.torproject.org/userstats-bridge-country.html?start=2017-01-…">UAE bridge graph</a>", "<a href=\"https://bugs.torproject.org/21345\">ticket</a>" ], "unknown": true @@ -866,6 +887,19 @@ "unknown": true }, { + "start": "2017-06-13", + "place": "ch", + "protocols": [ + "obfs4" + ], + "description": "Increase in obfs4 users in Switzerland, from 200 to 400.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-bridge-country.html?start=2017-01-…">bridge graph</a>", + "<a href=\"https://metrics.torproject.org/userstats-bridge-combined.html?start=2017-01…">transport graph</a>" + ], + "unknown": true + }, + { "start": "2017-06-14", "place": "ml", "description": "Sudden increase of direct and bridge users in Mali.", @@ -876,14 +910,81 @@ "unknown": true }, { + "start": "2017-07-15", + "end": "2017-07-22", + "place": "sc", + "protocols": [ + "<OR>", + "relay" + ], + "description": "Increase of relay users in the Seychelles, from 400 to 6000. Bridge users not affected.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-05-1…">relay graph</a>" + ], + "unknown": true + }, + { + "start": "2017-07-31", + "place": "nl", + "protocols": [ + "<OR>", + "relay" + ], + "description": "Increase of relay users in the Netherlands, from 50k to 100k.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-05-1…">relay graph</a>" + ], + "unknown": true + }, + { + "start": "2017-07-31", + "place": "ro", + "protocols": [ + "<OR>", + "relay" + ], + "description": "Increase of relay users in Romania, from 10k to 40k. Bridge users not affected.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-05-1…">relay graph</a>" + ], + "unknown": true + }, + { "start": "2017-08-02", "place": "lt", "protocols": [ - "<OR>" + "<OR>", + "relay" + ], + "description": "Increase of relay users in Lithuania, from 2k to 70k. Bridge users not affected.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-06-0…">relay graph</a>" + ], + "unknown": true + }, + { + "start": "2017-08-06", + "place": "sc", + "protocols": [ + "<OR>", + "relay" + ], + "description": "Further increase of relay users in the Seychelles, from 5k to 100k. Bridge users not affected.", + "links": [ + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-05-1…">relay graph</a>" + ], + "unknown": true + }, + { + "start": "2017-08-07", + "place": "at", + "protocols": [ + "<OR>", + "relay" ], - "description": "Increase of direct users in Lithuania, from 2k to 70k. Bridge users not affected.", + "description": "Fluctuations of relay users in Austria. Bridge users not affected.", "links": [ - "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-06-0…">graph</a>" + "<a href=\"https://metrics.torproject.org/userstats-relay-country.html?start=2017-05-1…">relay graph</a>" ], "unknown": true }

1 0

[snowflake/master] Move handling of -ice option into main.
by dcf＠torproject.org 14 Aug '17

14 Aug '17

commit 0c02af35d0a09ec1616ab8e23e6d833842d4f05e Author: David Fifield <david(a)bamsoftware.com> Date: Mon Aug 14 12:27:45 2017 -0700 Move handling of -ice option into main. Rather than having it happen as a side effect of flag parsing. Having it happen as a side effect of flag parsing caused log messages related to handling the option (e.g. "IceServerList:") to always go to stderr, despite the presence of a -log option. This is because the requested log file had not been opened yet. --- client/snowflake.go | 13 +++++++++++-- client/util.go | 13 ------------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/client/snowflake.go b/client/snowflake.go index 764efb3..647e40e 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -10,6 +10,7 @@ import ( "net" "os" "os/signal" + "strings" "sync" "syscall" "time" @@ -121,8 +122,7 @@ func copyLoop(a, b io.ReadWriter) { } func main() { - var iceServers IceServerList - flag.Var(&iceServers, "ice", "comma-separated list of ICE servers") + iceServersCommas := flag.String("ice", "", "comma-separated list of ICE servers") brokerURL := flag.String("url", "", "URL of signaling broker") frontDomain := flag.String("front", "", "front domain") logFilename := flag.String("log", "", "name of log file") @@ -144,6 +144,15 @@ func main() { log.Println("\n\n\n --- Starting Snowflake Client ---") + var iceServers IceServerList + log.Println("IceServerList:") + for _, server := range strings.Split(*iceServersCommas, ",") { + // TODO: STUN / TURN url format validation? + log.Println(server) + option := webrtc.OptionIceServer(server) + iceServers = append(iceServers, option) + } + // Prepare to collect remote WebRTC peers. snowflakes := NewPeers(*max) if "" != *brokerURL { diff --git a/client/util.go b/client/util.go index 74cd669..c90e17d 100644 --- a/client/util.go +++ b/client/util.go @@ -1,9 +1,7 @@ package main import ( - "fmt" "log" - "strings" "time" "github.com/keroserene/go-webrtc" @@ -19,17 +17,6 @@ func (i *IceServerList) String() string { return fmt.Sprint(*i) } -func (i *IceServerList) Set(s string) error { - log.Println("IceServerList:") - for _, server := range strings.Split(s, ",") { - // TODO: STUN / TURN url format validation? - log.Println(server) - option := webrtc.OptionIceServer(server) - *i = append(*i, option) - } - return nil -} - type BytesLogger interface { Log() AddOutbound(int)

1 0

[stem/master] Avoid infinite recursion from new is_geoip_unavailable check
by atagar＠torproject.org 14 Aug '17

14 Aug '17

commit f2305304084c62016b030064b97e43388d5af57a Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 14 10:36:40 2017 -0700 Avoid infinite recursion from new is_geoip_unavailable check Um... oops. /nyx/stem/control.py", line 469, in wrapped return func(self, *args, **kwargs) File "/home/ubuntu/nyx/stem/control.py", line 1147, in get_info if param.startswith('ip-to-country/') and self.is_geoip_unavailable(): File "/home/ubuntu/nyx/stem/control.py", line 3661, in is_geoip_unavailable self.get_info('ip-to-country/0.0.0.0') File "/home/ubuntu/nyx/stem/control.py", line 469, in wrapped return func(self, *args, **kwargs) File "/home/ubuntu/nyx/stem/control.py", line 1147, in get_info if param.startswith('ip-to-country/') and self.is_geoip_unavailable(): File "/home/ubuntu/nyx/stem/control.py", line 3661, in is_geoip_unavailable self.get_info('ip-to-country/0.0.0.0') File "/home/ubuntu/nyx/stem/control.py", line 469, in wrapped return func(self, *args, **kwargs) File "/home/ubuntu/nyx/stem/control.py", line 1139, in get_info cached_results = self._get_cache_map(from_cache, 'getinfo') File "/home/ubuntu/nyx/stem/control.py", line 3064, in _get_cache_map with self._cache_lock: File "/usr/lib/python2.7/threading.py", line 169, in acquire if self.__owner == me: RuntimeError: maximum recursion depth exceeded in cmp --- stem/control.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/control.py b/stem/control.py index 760f9433..7dc632bb 100644 --- a/stem/control.py +++ b/stem/control.py @@ -1144,7 +1144,7 @@ class Controller(BaseController): params.remove(user_expected_key) for param in params: - if param.startswith('ip-to-country/') and self.is_geoip_unavailable(): + if param.startswith('ip-to-country/') and param != 'ip-to-country/0.0.0.0' and self.is_geoip_unavailable(): raise stem.ProtocolError('Tor geoip database is unavailable') # if everything was cached then short circuit making the query

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2017