November 2017 - tor-commits - lists.torproject.org

[nyx/master] Consolidate redraws if unable to draw for a while
by atagar＠torproject.org 01 Nov '17

01 Nov '17

commit 2c8c116da8cffa9e437fdcc04ca77031d2a2672e Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 1 12:07:34 2017 -0700 Consolidate redraws if unable to draw for a while When the menu's open for a while we block the graph panel from redrawing itself, causing events to accumilate. Then when the menu's closed we perform a flurry of updates which makes the graph appear to catch up in fast forward. Instead, if a panel is unable to draw itself after a second it gives up the redraw attempt. This way when the menu's closed we perform just a single redraw that catches us up. Caught thanks to Guinness on tor-relays@. --- nyx/curses.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/nyx/curses.py b/nyx/curses.py index 349572e..976f625 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -92,6 +92,7 @@ import functools import os import re import threading +import time import stem.util.conf import stem.util.enum @@ -709,7 +710,15 @@ def draw(func, left = 0, top = 0, width = None, height = None, background = None :returns: :class:`~nyx.curses.Dimension` for the space we drew within """ - with CURSES_LOCK: + start = time.time() + + while not CURSES_LOCK.acquire(False): + if (time.time() - start) > 1: + return # if we've been blocked from drawing for a full second then abort + + time.sleep(0.05) + + try: if HALT_ACTIVITY: return @@ -738,6 +747,8 @@ def draw(func, left = 0, top = 0, width = None, height = None, background = None curses_subwindow.refresh() return subwindow_dimensions + finally: + CURSES_LOCK.release() class _Subwindow(object):

1 0

[nyx/master] Truncate average connction counts to ints
by atagar＠torproject.org 01 Nov '17

01 Nov '17

commit 811129d5f9c7dfccdd22b7f12141c799d9292a02 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 1 11:13:38 2017 -0700 Truncate average connction counts to ints Oops, we displayed an unbounded decimal precision for the connection graph's average count. Who cares what the sixth decimal point of precision is? :P It's an average of a big whole number. As such just truncating to ints. Caught thanks to Toralf. --- nyx/panel/graph.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index ff110e6..0d28a35 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -389,8 +389,8 @@ class ConnectionStats(GraphCategory): self.primary.update(inbound_count) self.secondary.update(outbound_count) - self._primary_header_stats = [str(self.primary.latest_value), ', avg: %s' % self.primary.average()] - self._secondary_header_stats = [str(self.secondary.latest_value), ', avg: %s' % self.secondary.average()] + self._primary_header_stats = [str(self.primary.latest_value), ', avg: %i' % self.primary.average()] + self._secondary_header_stats = [str(self.secondary.latest_value), ', avg: %i' % self.secondary.average()] class ResourceStats(GraphCategory):

1 0

[nyx/master] Let nyx shut down faster
by atagar＠torproject.org 01 Nov '17

01 Nov '17

commit b29878e70c46a226c76d45c9adad746d54751213 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Nov 1 11:34:24 2017 -0700 Let nyx shut down faster Especially when first starting up nyx takes a couple seconds to shut down on my relay. This is because the update method of our connection panel can take a while if there's many relays. Aborting in the middle of its longest part if the thread's terminated. This drops our shutdown time in practice to a few milliseconds. --- nyx/panel/connection.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 15a2638..f4d7df6 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -531,6 +531,12 @@ class ConnectionPanel(nyx.panel.DaemonPanel): for entry in new_entries: line = entry.get_lines()[0] + # This loop is the lengthiest part of our update. If our thread's stopped + # we should abort further work. + + if self._halt: + return + if entry.is_private() and line.connection not in self._counted_connections: if entry.get_type() == Category.INBOUND and line.locale: self._client_locale_usage[line.locale] = self._client_locale_usage.get(line.locale, 0) + 1

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit 588be5b0286bd97ef725a070a5176c6467dd3d46 Merge: 8a8b5d590 8687d9cf4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 1 13:50:06 2017 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24115 | 4 ++++ doc/tor.1.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] man: Specify HiddenServiceNumIntroductionPoints for v3
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit 8687d9cf441514977e93e774dfe29a6f3816dcfc Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 1 12:35:14 2017 -0400 man: Specify HiddenServiceNumIntroductionPoints for v3 A v3 service can have between 0 and 20 intro points where v2 has 0 to 10. Fixes #24115 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24115 | 4 ++++ doc/tor.1.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug24115 b/changes/bug24115 new file mode 100644 index 000000000..767f13840 --- /dev/null +++ b/changes/bug24115 @@ -0,0 +1,4 @@ + o Minor bugfixes (manpage, hidden service): + - Mention that the HiddenServiceNumIntroductionPoints option is 0-10 for + v2 service and 0-20 for v3 service. Fixes bug 24115; bugfix on + 0.3.2.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e76efddcd..86999667a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2445,7 +2445,7 @@ The following options are used to configure a hidden service. [[HiddenServiceNumIntroductionPoints]] **HiddenServiceNumIntroductionPoints** __NUM__:: Number of introduction points the hidden service will have. You can't - have more than 10. (Default: 3) + have more than 10 for v2 service and 20 for v3. (Default: 3) [[HiddenServiceSingleHopMode]] **HiddenServiceSingleHopMode** **0**|**1**:: **Experimental - Non Anonymous** Hidden Services on a tor instance in

1 0

[tor/release-0.3.2] man: Specify HiddenServiceNumIntroductionPoints for v3
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit 8687d9cf441514977e93e774dfe29a6f3816dcfc Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 1 12:35:14 2017 -0400 man: Specify HiddenServiceNumIntroductionPoints for v3 A v3 service can have between 0 and 20 intro points where v2 has 0 to 10. Fixes #24115 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24115 | 4 ++++ doc/tor.1.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug24115 b/changes/bug24115 new file mode 100644 index 000000000..767f13840 --- /dev/null +++ b/changes/bug24115 @@ -0,0 +1,4 @@ + o Minor bugfixes (manpage, hidden service): + - Mention that the HiddenServiceNumIntroductionPoints option is 0-10 for + v2 service and 0-20 for v3 service. Fixes bug 24115; bugfix on + 0.3.2.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e76efddcd..86999667a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2445,7 +2445,7 @@ The following options are used to configure a hidden service. [[HiddenServiceNumIntroductionPoints]] **HiddenServiceNumIntroductionPoints** __NUM__:: Number of introduction points the hidden service will have. You can't - have more than 10. (Default: 3) + have more than 10 for v2 service and 20 for v3. (Default: 3) [[HiddenServiceSingleHopMode]] **HiddenServiceSingleHopMode** **0**|**1**:: **Experimental - Non Anonymous** Hidden Services on a tor instance in

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit affaaa1968ceed8d33b11168221887dbb52f0285 Merge: acdd349de 8687d9cf4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 1 13:50:06 2017 -0400 Merge branch 'maint-0.3.2' changes/bug24115 | 4 ++++ doc/tor.1.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.2] man: Specify HiddenServiceNumIntroductionPoints for v3
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit 8687d9cf441514977e93e774dfe29a6f3816dcfc Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 1 12:35:14 2017 -0400 man: Specify HiddenServiceNumIntroductionPoints for v3 A v3 service can have between 0 and 20 intro points where v2 has 0 to 10. Fixes #24115 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug24115 | 4 ++++ doc/tor.1.txt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug24115 b/changes/bug24115 new file mode 100644 index 000000000..767f13840 --- /dev/null +++ b/changes/bug24115 @@ -0,0 +1,4 @@ + o Minor bugfixes (manpage, hidden service): + - Mention that the HiddenServiceNumIntroductionPoints option is 0-10 for + v2 service and 0-20 for v3 service. Fixes bug 24115; bugfix on + 0.3.2.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index e76efddcd..86999667a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2445,7 +2445,7 @@ The following options are used to configure a hidden service. [[HiddenServiceNumIntroductionPoints]] **HiddenServiceNumIntroductionPoints** __NUM__:: Number of introduction points the hidden service will have. You can't - have more than 10. (Default: 3) + have more than 10 for v2 service and 20 for v3. (Default: 3) [[HiddenServiceSingleHopMode]] **HiddenServiceSingleHopMode** **0**|**1**:: **Experimental - Non Anonymous** Hidden Services on a tor instance in

1 0

[tor/master] rename {,TOR_}RUST_DEPENDENCIES
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit acdd349dee9edf1b3af354f3c8decb91ee267ba0 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat May 27 17:51:21 2017 +0200 rename {,TOR_}RUST_DEPENDENCIES --- configure.ac | 16 ++++++++-------- src/rust/.cargo/config.in | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 50dfd5d96..998bb914b 100644 --- a/configure.ac +++ b/configure.ac @@ -418,22 +418,22 @@ if test "x$enable_rust" = "xyes"; then dnl When we're not allowed to touch the network, we need crate dependencies dnl locally available. AC_MSG_CHECKING([rust crate dependencies]) - AC_ARG_VAR([RUST_DEPENDENCIES], [path to directory with local crate mirror]) - if test "x$RUST_DEPENDENCIES" = "x"; then - RUST_DEPENDENCIES="$srcdir/src/ext/rust/" + AC_ARG_VAR([TOR_RUST_DEPENDENCIES], [path to directory with local crate mirror]) + if test "x$TOR_RUST_DEPENDENCIES" = "x"; then + TOR_RUST_DEPENDENCIES="$srcdir/src/ext/rust/" NEED_MOD=1 fi - if test ! -d "$RUST_DEPENDENCIES"; then - AC_MSG_ERROR([Rust dependency directory $RUST_DEPENDENCIES does not exist. Specify a dependency directory using the RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.]) + if test ! -d "$TOR_RUST_DEPENDENCIES"; then + AC_MSG_ERROR([Rust dependency directory $TOR_RUST_DEPENDENCIES does not exist. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.]) fi for dep in $rust_crates; do - if test ! -d "$RUST_DEPENDENCIES"/"$dep"; then - AC_MSG_ERROR([Failure to find rust dependency $RUST_DEPENDENCIES/$dep. Specify a dependency directory using the RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.]) + if test ! -d "$TOR_RUST_DEPENDENCIES"/"$dep"; then + AC_MSG_ERROR([Failure to find rust dependency $TOR_RUST_DEPENDENCIES/$dep. Specify a dependency directory using the TOR_RUST_DEPENDENCIES variable or allow cargo to fetch crates using --enable-cargo-online-mode.]) fi done if test "x$NEED_MOD" = "x1"; then dnl When looking for dependencies from cargo, pick right directory - RUST_DEPENDENCIES="../../src/ext/rust" + TOR_RUST_DEPENDENCIES="../../src/ext/rust" fi fi diff --git a/src/rust/.cargo/config.in b/src/rust/.cargo/config.in index 414b253a5..301e7fdbe 100644 --- a/src/rust/.cargo/config.in +++ b/src/rust/.cargo/config.in @@ -5,4 +5,4 @@ @RUST_DL@ replace-with = 'vendored-sources' @RUST_DL@ [source.vendored-sources] -@RUST_DL@ directory = '@RUST_DEPENDENCIES@' +@RUST_DL@ directory = '@TOR_RUST_DEPENDENCIES@'

1 0

[torspec/master] Document __OwningControllerFD
by nickm＠torproject.org 01 Nov '17

01 Nov '17

commit 77dce45902e11d5cec45609ce55b153122e6a28d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Oct 18 13:30:00 2017 -0400 Document __OwningControllerFD --- control-spec.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index f45efe1..33b715d 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -3218,6 +3218,17 @@ (String. Default: unset.) + __OwningControllerFD + + If this option is a valid socket, Tor will start with an open control + connection on this socket. Added in Tor 0.3.3.xxxx. + + This socket will be an owning controller, as if it had already called + TAKEOWNERSHIP. It will be automatically authenticated. This option + should only be used by other programs that are starting Tor. + + (Integer. Default: -1.) + 5.5. Phases from the Bootstrap status event. This section describes the various bootstrap phases currently reported

1 0