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

[stem/master] Torrc options for integ test logs
by atagar＠torproject.org 10 Jun '19

10 Jun '19

commit 3efc9c5cf104e8ddcde3aa59ba7aaf002239cc9c Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jun 10 11:01:21 2019 -0700 Torrc options for integ test logs Adding the following options to our integ torrc... ProtocolWarnings 1 SafeLogging 0 LogTimeGranularity 1 Requested on... https://trac.torproject.org/projects/tor/ticket/25632 --- test/settings.cfg | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/test/settings.cfg b/test/settings.cfg index 6a2f5914..d422ffa8 100644 --- a/test/settings.cfg +++ b/test/settings.cfg @@ -22,15 +22,20 @@ integ.log ./test/data/log integ.torrc |# Configuration for stem's integration tests | -|DataDirectory [DATA_DIR] |SocksPort [SOCKS_PORT] |ORPort [OR_PORT] -|ExitRelay 0 -|PublishServerDescriptor 0 -|AssumeReachable 1 -|DownloadExtraInfo 1 +| +|DataDirectory [DATA_DIR] |Log notice stdout |Log debug file [DATA_DIR]/tor_log +| +|AssumeReachable 1 +|DownloadExtraInfo 1 +|ExitRelay 0 +|LogTimeGranularity 1 +|ProtocolWarnings 1 +|PublishServerDescriptor 0 +|SafeLogging 0 # To append additional torrc options you can overwrite the following. For # example...

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 10 Jun '19

10 Jun '19

commit 5ef081eee412b662468790473c94abbb8dc81a2c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 10 17:46:09 2019 +0000 Update translations for https_everywhere_completed --- pt_PT/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/pt_PT/https-everywhere.dtd b/pt_PT/https-everywhere.dtd index 5af48ca55..217eea85b 100644 --- a/pt_PT/https-everywhere.dtd +++ b/pt_PT/https-everywhere.dtd @@ -35,6 +35,7 @@ <!ENTITY https-everywhere.options.storedRulesetsVersion "Versão dos conjuntos de regras armazenados:"> <!ENTITY https-everywhere.options.updatesLastChecked "Atualizações verificadas pela última vez:"> <!ENTITY https-everywhere.options.updatesLastCheckedNever "nunca"> +<!ENTITY https-everywhere.options.debuggingRulesets "Depuração de conjuntos de regras (avançado)"> <!ENTITY https-everywhere.prefs.export_settings "Exportar configurações"> <!ENTITY https-everywhere.prefs.reset_defaults "Restaurar Predefinições">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 10 Jun '19

10 Jun '19

commit 2252d47b66763ac0e1e3467e4fb654db71f31750 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 10 17:45:59 2019 +0000 Update translations for https_everywhere --- pt_PT/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_PT/https-everywhere.dtd b/pt_PT/https-everywhere.dtd index 9bb629ae7..217eea85b 100644 --- a/pt_PT/https-everywhere.dtd +++ b/pt_PT/https-everywhere.dtd @@ -35,7 +35,7 @@ <!ENTITY https-everywhere.options.storedRulesetsVersion "Versão dos conjuntos de regras armazenados:"> <!ENTITY https-everywhere.options.updatesLastChecked "Atualizações verificadas pela última vez:"> <!ENTITY https-everywhere.options.updatesLastCheckedNever "nunca"> -<!ENTITY https-everywhere.options.debuggingRulesets "Debugging Rulesets (advanced)"> +<!ENTITY https-everywhere.options.debuggingRulesets "Depuração de conjuntos de regras (avançado)"> <!ENTITY https-everywhere.prefs.export_settings "Exportar configurações"> <!ENTITY https-everywhere.prefs.reset_defaults "Restaurar Predefinições">

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1038'
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit df8e2bbc0f3b361e1d5beb8c00d076e2c9788046 Merge: 1190636f2 fb91e1c6e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 09:38:40 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1038' changes/ticket30550 | 2 + configure.ac | 1 - contrib/dist/torctl.in | 195 ------------------------------------------------- contrib/include.am | 1 - 4 files changed, 2 insertions(+), 197 deletions(-)

1 0

[tor/master] Remove torctl.in from contrib/dist
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit fb91e1c6efed6e5526170df3650fac65b701524b Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue May 21 14:56:53 2019 +0300 Remove torctl.in from contrib/dist --- changes/ticket30550 | 2 + configure.ac | 1 - contrib/dist/torctl.in | 195 ------------------------------------------------- contrib/include.am | 1 - 4 files changed, 2 insertions(+), 197 deletions(-) diff --git a/changes/ticket30550 b/changes/ticket30550 new file mode 100644 index 000000000..f356c4048 --- /dev/null +++ b/changes/ticket30550 @@ -0,0 +1,2 @@ + o Removed features: + - Remove torctl.in from contrib/dist directory. Resolves ticket 30550. diff --git a/configure.ac b/configure.ac index e65e960d7..3c4ce438e 100644 --- a/configure.ac +++ b/configure.ac @@ -2458,7 +2458,6 @@ AC_CONFIG_FILES([ Makefile config.rust contrib/operator-tools/tor.logrotate - contrib/dist/torctl contrib/dist/tor.service src/config/torrc.sample src/config/torrc.minimal diff --git a/contrib/dist/torctl.in b/contrib/dist/torctl.in deleted file mode 100644 index 4cc137da4..000000000 --- a/contrib/dist/torctl.in +++ /dev/null @@ -1,195 +0,0 @@ -#!/bin/sh -# -# TOR control script designed to allow an easy command line interface -# to controlling The Onion Router -# -# The exit codes returned are: -# 0 - operation completed successfully. For "status", tor running. -# 1 - For "status", tor not running. -# 2 - Command not supported -# 3 - Could not be started or reloaded -# 4 - Could not be stopped -# 5 - -# 6 - -# 7 - -# 8 - -# -# When multiple arguments are given, only the error from the _last_ -# one is reported. -# -# -# |||||||||||||||||||| START CONFIGURATION SECTION |||||||||||||||||||| -# -------------------- -------------------- -# Name of the executable -EXEC=tor -# -# the path to your binary, including options if necessary -TORBIN="@BINDIR@/$EXEC" -# -# the path to the configuration file -TORCONF="@CONFDIR@/torrc" -# -# the path to your PID file -PIDFILE="@LOCALSTATEDIR@/run/tor/tor.pid" -# -# The path to the log file -LOGFILE="@LOCALSTATEDIR@/log/tor/tor.log" -# -# The path to the datadirectory -TORDATA="@LOCALSTATEDIR@/lib/tor" -# -TORARGS="--pidfile $PIDFILE --log \"notice file $LOGFILE\" --runasdaemon 1" -TORARGS="$TORARGS --datadirectory $TORDATA" - -# If user name is set in the environment, then use it; -# otherwise run as the invoking user (or whatever user the config -# file says)... unless the invoking user is root. The idea here is to -# let an unprivileged user run tor for her own use using this script, -# while still providing for it to be used as a system daemon. -if [ "x`id -u`" = "x0" ]; then - TORUSER=@TORUSER@ -fi - -if [ "x$TORUSER" != "x" ]; then - TORARGS="$TORARGS --user $TORUSER" -fi - -# We no longer wrap the Tor daemon startup in an su when running as -# root, because it's too painful to make the use of su portable. -# Just let the daemon set the UID and GID. -START="$TORBIN -f $TORCONF $TORARGS" - -# -# -------------------- -------------------- -# |||||||||||||||||||| END CONFIGURATION SECTION |||||||||||||||||||| - -ERROR=0 -ARGV="$@" -if [ "x$ARGV" = "x" ] ; then - ARGS="help" -fi - -checkIfRunning ( ) { - # check for pidfile - PID=unknown - if [ -f $PIDFILE ] ; then - PID=`/bin/cat $PIDFILE` - if [ "x$PID" != "x" ] ; then - if kill -0 $PID 2>/dev/null ; then - STATUS="$EXEC (pid $PID) running" - RUNNING=1 - else - STATUS="PID file ($PIDFILE) present, but $EXEC ($PID) not running" - RUNNING=0 - fi - else - STATUS="$EXEC (pid $PID?) not running" - RUNNING=0 - fi - else - STATUS="$EXEC apparently not running (no pid file)" - RUNNING=0 - fi - return -} - -for ARG in $@ $ARGS -do - checkIfRunning - - case $ARG in - start) - if [ $RUNNING -eq 1 ]; then - echo "$0 $ARG: $EXEC (pid $PID) already running" - continue - fi - if eval "$START" ; then - echo "$0 $ARG: $EXEC started" - # Make sure it stayed up! - /bin/sleep 1 - checkIfRunning - if [ $RUNNING -eq 0 ]; then - echo "$0 $ARG: $EXEC (pid $PID) quit unexpectedly" - fi - else - echo "$0 $ARG: $EXEC could not be started" - ERROR=3 - fi - ;; - stop) - if [ $RUNNING -eq 0 ]; then - echo "$0 $ARG: $STATUS" - continue - fi - if kill -15 $PID ; then - echo "$0 $ARG: $EXEC stopped" - else - /bin/sleep 1 - if kill -9 $PID ; then - echo "$0 $ARG: $EXEC stopped" - else - echo "$0 $ARG: $EXEC could not be stopped" - ERROR=4 - fi - fi - # Make sure it really died! - /bin/sleep 1 - checkIfRunning - if [ $RUNNING -eq 1 ]; then - echo "$0 $ARG: $EXEC (pid $PID) unexpectedly still running" - ERROR=4 - fi - ;; - restart) - $0 stop start - ;; - reload) - if [ $RUNNING -eq 0 ]; then - echo "$0 $ARG: $STATUS" - continue - fi - if kill -1 $PID; then - /bin/sleep 1 - echo "$EXEC (PID $PID) reloaded" - else - echo "Can't reload $EXEC" - ERROR=3 - fi - ;; - status) - echo $STATUS - if [ $RUNNING -eq 1 ]; then - ERROR=0 - else - ERROR=1 - fi - ;; - log) - cat $LOGFILE - ;; - help) - echo "usage: $0 (start|stop|restart|status|help)" - /bin/cat <<EOF - -start - start $EXEC -stop - stop $EXEC -restart - stop and restart $EXEC if running or start if not running -reload - cause the running process to reinitialize itself -status - tell whether $EXEC is running or not -log - display the contents of the log file -help - this text - -EOF - ERROR=0 - ;; - *) - $0 help - ERROR=2 - ;; - - esac - -done - -exit $ERROR - diff --git a/contrib/include.am b/contrib/include.am index 8dd859330..784f5427b 100644 --- a/contrib/include.am +++ b/contrib/include.am @@ -3,7 +3,6 @@ EXTRA_DIST+= \ contrib/README \ contrib/client-tools/torify \ contrib/dist/rc.subr \ - contrib/dist/torctl \ contrib/dist/tor.service.in \ contrib/operator-tools/tor-exit-notice.html \ contrib/or-tools/exitlist \

1 0

[tor/master] Merge branch 'maint-0.4.1'
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit 1190636f24ec0f3f4a1d43ceb9e0cfc68c340d57 Merge: adc7b50ea 765e4364d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 09:37:28 2019 -0400 Merge branch 'maint-0.4.1' changes/doc30630 | 3 +++ doc/HACKING/ReleasingTor.md | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/master] Mention Travis/Appveyor/Jenkins URLs in ReleasingTor.md
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit 5d4b4f948a338a41966bb2e15af5875d4df8a08f Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri May 31 09:35:19 2019 +0300 Mention Travis/Appveyor/Jenkins URLs in ReleasingTor.md --- changes/doc30630 | 3 +++ doc/HACKING/ReleasingTor.md | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/doc30630 b/changes/doc30630 new file mode 100644 index 000000000..0fbd8d4dd --- /dev/null +++ b/changes/doc30630 @@ -0,0 +1,3 @@ + o Documentation: + - Mention URLs for Travis/Appveyor/Jenkins in ReleasingTor.md. Closes + ticket 30630. diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 4c87a366c..d9864dba2 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -20,8 +20,11 @@ new Tor release: === I. Make sure it works -1. Make sure that CI passes: have a look at Travis, Appveyor, and - Jenkins. Make sure you're looking at the right branches. +1. Make sure that CI passes: have a look at Travis + (https://travis-ci.org/torproject/tor/branches) Appveyor + (https://ci.appveyor.com/project/torproject/tor/history) and + Jenkins (https://jenkins.torproject.org/view/tor/) + Make sure you're looking at the right branches. If there are any unexplained failures, try to fix them or figure them out. @@ -244,3 +247,5 @@ new Tor release: master branch. 3. Keep an eye on the blog post, to moderate comments and answer questions. + +

1 0

[tor/maint-0.4.1] Mention Travis/Appveyor/Jenkins URLs in ReleasingTor.md
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit 5d4b4f948a338a41966bb2e15af5875d4df8a08f Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Fri May 31 09:35:19 2019 +0300 Mention Travis/Appveyor/Jenkins URLs in ReleasingTor.md --- changes/doc30630 | 3 +++ doc/HACKING/ReleasingTor.md | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/doc30630 b/changes/doc30630 new file mode 100644 index 000000000..0fbd8d4dd --- /dev/null +++ b/changes/doc30630 @@ -0,0 +1,3 @@ + o Documentation: + - Mention URLs for Travis/Appveyor/Jenkins in ReleasingTor.md. Closes + ticket 30630. diff --git a/doc/HACKING/ReleasingTor.md b/doc/HACKING/ReleasingTor.md index 4c87a366c..d9864dba2 100644 --- a/doc/HACKING/ReleasingTor.md +++ b/doc/HACKING/ReleasingTor.md @@ -20,8 +20,11 @@ new Tor release: === I. Make sure it works -1. Make sure that CI passes: have a look at Travis, Appveyor, and - Jenkins. Make sure you're looking at the right branches. +1. Make sure that CI passes: have a look at Travis + (https://travis-ci.org/torproject/tor/branches) Appveyor + (https://ci.appveyor.com/project/torproject/tor/history) and + Jenkins (https://jenkins.torproject.org/view/tor/) + Make sure you're looking at the right branches. If there are any unexplained failures, try to fix them or figure them out. @@ -244,3 +247,5 @@ new Tor release: master branch. 3. Keep an eye on the blog post, to moderate comments and answer questions. + +

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit 765e4364d97cea17affef7413cda5fa02eb8f347 Merge: ecc5feff3 5d4b4f948 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 09:37:17 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1 changes/doc30630 | 3 +++ doc/HACKING/ReleasingTor.md | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1
by nickm＠torproject.org 10 Jun '19

10 Jun '19

commit 765e4364d97cea17affef7413cda5fa02eb8f347 Merge: ecc5feff3 5d4b4f948 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 10 09:37:17 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1064' into maint-0.4.1 changes/doc30630 | 3 +++ doc/HACKING/ReleasingTor.md | 9 +++++++-- 2 files changed, 10 insertions(+), 2 deletions(-)

1 0