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

[community/master] Merge branch 'patch-1' of github.com:KenKundert/community into patch-1
by phw＠torproject.org 03 Sep '19

03 Sep '19

commit e425b9886bc256f5294a4797f5182a54d20180de Merge: 6c837c7 a6a8c35 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Sep 3 08:42:51 2019 -0700 Merge branch 'patch-1' of github.com:KenKundert/community into patch-1 .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

1 0

[community/master] Use TODO1 and TODO2 to highlight port difference.
by phw＠torproject.org 03 Sep '19

03 Sep '19

commit 4577ba8d28a5716e5866e309ff49d182e63bea10 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Sep 3 08:45:32 2019 -0700 Use TODO1 and TODO2 to highlight port difference. We don't want people to think that the OR port and obfs4 port are supposed to be the same. Thanks to Ken Kundert for pointing out this issue and for fixing it for CentOS/RHEL/OpenSuSE in commit a6a8c35. --- .../technical-setup/bridge/debian-ubuntu/contents.lr | 12 +++++++----- .../technical-setup/bridge/freebsd/contents.lr | 11 ++++++----- .../technical-setup/bridge/openbsd/contents.lr | 11 ++++++----- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr index eed3be8..b97259c 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -25,16 +25,18 @@ If not, you can [build it from source](https://gitlab.com/yawning/obfs4#installa ``` BridgeRelay 1 -# Replace "TODO" with a Tor port of your choice. This port must be externally +# Replace "TODO1" with a Tor port of your choice. This port must be externally # reachable. Avoid port 9001 because it's commonly associated with Tor and # censors may be scanning the Internet for this port. -ORPort TODO +ORPort TODO1 ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy -# Replace "TODO" with an obfs4 port of your choice. This port must be externally reachable. -# Avoid port 9001 because it's commonly associated with Tor and censors may be scanning the Internet for this port. -ServerTransportListenAddr obfs4 0.0.0.0:TODO +# Replace "TODO2" with an obfs4 port of your choice. This port must be +# externally reachable and must be different from the one specified for ORPort. +# Avoid port 9001 because it's commonly associated with +# Tor and censors may be scanning the Internet for this port. +ServerTransportListenAddr obfs4 0.0.0.0:TODO2 # Local communication port between Tor and obfs4. Always set this to "auto". # "Ext" means "extended", not "external". Don't try to set a specific port number, nor listen on 0.0.0.0. diff --git a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr index 862551a..951ef31 100644 --- a/content/relay-operations/technical-setup/bridge/freebsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/freebsd/contents.lr @@ -22,17 +22,18 @@ pkg install obfs4proxy-tor tor ca_root_nss RunAsDaemon 1 BridgeRelay 1 -# Replace "TODO" with a Tor port of your choice. This port must be externally +# Replace "TODO1" with a Tor port of your choice. This port must be externally # reachable. Avoid port 9001 because it's commonly associated with Tor and # censors may be scanning the Internet for this port. -ORPort TODO +ORPort TODO1 ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy -# Replace "TODO" with an obfs4 port of your choice. This port must be -# externally reachable. Avoid port 9001 because it's commonly associated with +# Replace "TODO2" with an obfs4 port of your choice. This port must be +# externally reachable and must be different from the one specified for ORPort. +# Avoid port 9001 because it's commonly associated with # Tor and censors may be scanning the Internet for this port. -ServerTransportListenAddr obfs4 0.0.0.0:TODO +ServerTransportListenAddr obfs4 0.0.0.0:TODO2 # Local communication port between Tor and obfs4. Always set this to "auto". # "Ext" means "extended", not "external". Don't try to set a specific port diff --git a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr index 96ffc95..50d1a26 100644 --- a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr @@ -21,17 +21,18 @@ Usually located at `/etc/tor/torrc`, and replace its content with: RunAsDaemon 1 BridgeRelay 1 -# Replace "TODO" with a Tor port of your choice. This port must be externally +# Replace "TODO1" with a Tor port of your choice. This port must be externally # reachable. Avoid port 9001 because it's commonly associated with Tor and # censors may be scanning the Internet for this port. -ORPort TODO +ORPort TODO1 ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy -# Replace "TODO" with an obfs4 port of your choice. This port must be -# externally reachable. Avoid port 9001 because it's commonly associated with +# Replace "TODO2" with an obfs4 port of your choice. This port must be +# externally reachable and must be different from the one specified for ORPort. +# Avoid port 9001 because it's commonly associated with # Tor and censors may be scanning the Internet for this port. -ServerTransportListenAddr obfs4 0.0.0.0:TODO +ServerTransportListenAddr obfs4 0.0.0.0:TODO2 # Local communication port between Tor and obfs4. Always set this to "auto". # "Ext" means "extended", not "external". Don't try to set a specific port

1 0

[community/master] Fix port number ambiguity and path issue
by phw＠torproject.org 03 Sep '19

03 Sep '19

commit a6a8c35908c2db13d2eaa59d1d54a1319a082dc4 Author: Ken Kundert <thenurd(a)nurdletech.com> Date: Fri Aug 30 12:48:27 2019 -0700 Fix port number ambiguity and path issue When I read this I was stumped for a while by the fact that the same name was used for what I believe should be two different values. TODO was used for both the ORPort and the obfs4 port.. I tried to make it clear that these should be two different ports. Also, you install obfs4 into /usr/local/bin but then configured tor to use /usr/bin. Some issues I was unable to resolve: 1. on CentOS Linux release 7.6.1810 I was unable to install obfs4 using 'go get'. go get gitlab.com/yawning/obfs4.git/obfs4proxy # cd .; git clone https://gitlab.com/yawning/utls /tmp/tmp.HMbPtKs8RV/src/gitlab.com/yawning/utls.git error: RPC failed; result=22, HTTP code = 404 fatal: The remote end hung up unexpectedly package gitlab.com/yawning/utls.git: exit status 128 2. On Fedora 30 I was able to install obfs4, but I struggled with selinux. I needed: /sbin/restorecon -v /usr/local/bin/obfs4proxy Relabeled /usr/local/bin/obfs4proxy from system_u:object_r:tor_exec_t:s0 to system_u:object_r:bin_t:s0 and semanage port -a -t tor_port_t -p tcp 4151 to get things working. I suspect your suggested chcon was ill-advised and resulted in the need for me to run restorecon. --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr index 2d232a7..43f3883 100644 --- a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr +++ b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr @@ -48,17 +48,18 @@ sudo cp $GOPATH/bin/obfs4proxy /usr/local/bin/ RunAsDaemon 1 BridgeRelay 1 -# Replace "TODO" with a Tor port of your choice. This port must be externally +# Replace "TODO1" with a Tor port of your choice. This port must be externally # reachable. Avoid port 9001 because it's commonly associated with Tor and # censors may be scanning the Internet for this port. -ORPort TODO +ORPort TODO1 -ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy +ServerTransportPlugin obfs4 exec /usr/local/bin/obfs4proxy -# Replace "TODO" with an obfs4 port of your choice. This port must be -# externally reachable. Avoid port 9001 because it's commonly associated with +# Replace "TODO2" with an obfs4 port of your choice. This port must be +# externally reachable and must be different from the one specified for ORPort. +# Avoid port 9001 because it's commonly associated with # Tor and censors may be scanning the Internet for this port. -ServerTransportListenAddr obfs4 0.0.0.0:TODO +ServerTransportListenAddr obfs4 0.0.0.0:TODO2 # Local communication port between Tor and obfs4. Always set this to "auto". # "Ext" means "extended", not "external". Don't try to set a specific port

1 0

[translation/tor_outreach_md] https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md
by translation＠torproject.org 03 Sep '19

03 Sep '19

commit 87008c8ac67e3ff107440e5eabb1f4fcfc5df75f Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 3 15:23:37 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor_outreach_md --- tor-outreach2019-2020-fa.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tor-outreach2019-2020-fa.md b/tor-outreach2019-2020-fa.md index 13a729298..c0c871531 100644 --- a/tor-outreach2019-2020-fa.md +++ b/tor-outreach2019-2020-fa.md @@ -122,13 +122,13 @@ The third relay removes the last encryption layer and forwards the web page requ Bekele doesn't know that the website request came from Amal unless she tells him so. -## 7. Who uses Tor? +## 7. چه کسانی از تور استفاده می کنند؟ People all over the world use Tor to protect their privacy and access the web freely. Tor helps protect journalists, human rights defenders, domestic violence victims, academic researchers, and anyone experiencing tracking, censorship, or surveillance. -## 6. Why trust Tor? +## 6. چرا به تور اعتماد کنیم؟ Tor is designed for privacy. We don’t know who our users are, and we don't keep logs of user activity. @@ -154,10 +154,10 @@ Learn more about Tor by visiting our website, our wiki, finding us on IRC, joini Tor for Desktop torproject.org/download -TOR ON MOBILE -### Android +تور برای موبایل +### سیستم عامل اندروید Tor Browser for Android is available from GooglePlay. -### iOS +### سیستم عامل iOS Onion Browser, developed by M. Tigas, is the only browser we recommend for iOS.

1 0

[gettor/master] Fix git pull
by hiro＠torproject.org 03 Sep '19

03 Sep '19

commit ad2835d6f7e6bd96a745bebcb83f2cf30cb5ee9d Author: hiro <hiro(a)torproject.org> Date: Tue Sep 3 17:19:10 2019 +0200 Fix git pull --- roles/gettor/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index 4363f99..b56b288 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -7,6 +7,7 @@ - name: update gettor source git: repo: https://git.torproject.org/gettor.git + version: master dest: /srv/gettor.torproject.org/home/gettor/ clone: no update: yes

1 0

[gettor/master] Activate virtualenv
by hiro＠torproject.org 03 Sep '19

03 Sep '19

commit 075d12f12092b115cb8a359e0c9f65ae34f19be4 Author: hiro <hiro(a)torproject.org> Date: Tue Sep 3 17:13:50 2019 +0200 Activate virtualenv --- roles/gettor/tasks/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/gettor/tasks/main.yml b/roles/gettor/tasks/main.yml index fadacb6..4363f99 100644 --- a/roles/gettor/tasks/main.yml +++ b/roles/gettor/tasks/main.yml @@ -21,6 +21,9 @@ args: chdir: "{{ gettor_path }}" +- name: activate virtualenv + command: . { gettor_path }}/venv/bin/activate + - name: create database command: > {{ gettor_path }}/venv/bin/python3 {{ gettor_path }}/scripts/create_db -n -c -o

1 0

[tor/master] Merge branch 'tor-github/pr/1269'
by asn＠torproject.org 03 Sep '19

03 Sep '19

commit 7fa624537cded3859a6f8408f9613bc53b6a1875 Merge: a617001fd 1ef084c5f Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Sep 3 17:11:25 2019 +0300 Merge branch 'tor-github/pr/1269' src/feature/nodelist/routerset.c | 47 ++++++++++++++++++++++++++++++++++++++-- src/test/test_confparse.c | 4 ++++ 2 files changed, 49 insertions(+), 2 deletions(-)

1 0

[tor/master] Document configuration type definition functions for routerset_t
by asn＠torproject.org 03 Sep '19

03 Sep '19

commit f0c1f96adcc049c49f7784645a5b197c8b3e44af Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 28 12:23:36 2019 -0400 Document configuration type definition functions for routerset_t These functions are all used to implement the ROUTERSET_type_defn object, which maps strings to and from routerset_t configuration variables for the configuration module. --- src/feature/nodelist/routerset.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/feature/nodelist/routerset.c b/src/feature/nodelist/routerset.c index 12965ad0d..0b8916780 100644 --- a/src/feature/nodelist/routerset.c +++ b/src/feature/nodelist/routerset.c @@ -466,6 +466,13 @@ routerset_free_(routerset_t *routerset) tor_free(routerset); } +/** + * config helper: parse a routerset-typed variable. + * + * Takes as input as a single line in line; writes its results into a + * routerset_t** passed as target. On success return 0; on failure + * return -1 and store an error message into *errmsg. + **/ static int routerset_kv_parse(void *target, const config_line_t *line, char **errmsg, const void *params) @@ -488,6 +495,12 @@ routerset_kv_parse(void *target, const config_line_t *line, char **errmsg, } } +/** + * config helper: encode a routerset-typed variable. + * + * Return a newly allocated string containing the value of the + * routerset_t** passed as value. + */ static char * routerset_encode(const void *value, const void *params) { @@ -496,6 +509,11 @@ routerset_encode(const void *value, const void *params) return routerset_to_string(*p); } +/** + * config helper: free and clear a routerset-typed variable. + * + * Clear the routerset_t** passed as value. + */ static void routerset_clear(void *value, const void *params) { @@ -504,6 +522,13 @@ routerset_clear(void *value, const void *params) routerset_free(*p); // sets *p to NULL. } +/** + * config helper: copy a routerset-typed variable. + * + * Takes it input from a routerset_t** in src; writes its output to a + * routerset_t** in dest. Returns 0 on success, -1 on (impossible) + * failure. + **/ static int routerset_copy(void *dest, const void *src, const void *params) { @@ -518,6 +543,9 @@ routerset_copy(void *dest, const void *src, const void *params) return 0; } +/** + * Function table to implement a routerset_t-based configuration type. + **/ static const var_type_fns_t routerset_type_fns = { .kv_parse = routerset_kv_parse, .encode = routerset_encode, @@ -525,6 +553,15 @@ static const var_type_fns_t routerset_type_fns = { .copy = routerset_copy }; +/** + * Definition of a routerset_t-based configuration type. + * + * Values are mapped to and from strings using the format defined in + * routerset_parse(): nicknames, IP address patterns, and fingerprints--with + * optional space, separated by commas. + * + * Empty sets are represented as NULL. + **/ const var_type_def_t ROUTERSET_type_defn = { .name = "RouterList", .fns = &routerset_type_fns

1 0

[tor/master] Routerset config parsing: represent empty sets as NULL.
by asn＠torproject.org 03 Sep '19

03 Sep '19

commit 2074fed6642713bcdfdc76f379956e97663ab8d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 28 11:51:16 2019 -0400 Routerset config parsing: represent empty sets as NULL. routerset_t has two representations of an empty routerset: NULL, and a set containing no elements. But some of our config code assumes that empty routersets are represented as NULL. So let's give it what it assumes. Fixes bug 31495. Bugfix on e16b90b88a76; but not in any released Tor. --- src/feature/nodelist/routerset.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/feature/nodelist/routerset.c b/src/feature/nodelist/routerset.c index 76777847e..12965ad0d 100644 --- a/src/feature/nodelist/routerset.c +++ b/src/feature/nodelist/routerset.c @@ -479,6 +479,10 @@ routerset_kv_parse(void *target, const config_line_t *line, char **errmsg, *errmsg = tor_strdup("Invalid router list."); return -1; } else { + if (routerset_is_empty(rs)) { + /* Represent empty sets as NULL. */ + routerset_free(rs); + } *p = rs; return 0; } @@ -507,8 +511,10 @@ routerset_copy(void *dest, const void *src, const void *params) routerset_t **output = (routerset_t**)dest; const routerset_t *input = *(routerset_t**)src; routerset_free(*output); // sets *output to NULL - *output = routerset_new(); - routerset_union(*output, input); + if (! routerset_is_empty(input)) { + *output = routerset_new(); + routerset_union(*output, input); + } return 0; }

1 0

[tor/master] test_confparse: verify that clearing a routerset sets it to NULL.
by asn＠torproject.org 03 Sep '19

03 Sep '19

commit 1ef084c5fcc5f9185f05a71e7ca09fd88cfb641c Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 28 12:28:17 2019 -0400 test_confparse: verify that clearing a routerset sets it to NULL. --- src/test/test_confparse.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/test/test_confparse.c b/src/test/test_confparse.c index ec018f0c5..4df275fc3 100644 --- a/src/test/test_confparse.c +++ b/src/test/test_confparse.c @@ -592,6 +592,10 @@ test_confparse_reset(void *arg) config_reset_line(&test_fmt, tst, "interval", 1); tt_int_op(tst->interval, OP_EQ, 10); + tt_ptr_op(tst->routerset, OP_NE, NULL); + config_reset_line(&test_fmt, tst, "routerset", 0); + tt_ptr_op(tst->routerset, OP_EQ, NULL); + done: config_free(&test_fmt, tst); }

1 0