tor-commits January 2018

tor-commits@lists.torproject.org

18 participants
1738 discussions

[tor/master] Note contactinfo and myfamily as required in more places
by nickm＠torproject.org 12 Jan '18

12 Jan '18

commit 4c651b8c0414f1de5db87e9255b80f401a63263e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 20 11:10:14 2017 -0500 Note contactinfo and myfamily as required in more places Includes a sentence from cypherpunks; for ticket 24526. --- changes/bug24526 | 4 ++++ doc/tor.1.txt | 13 +++++++++++-- src/config/torrc.minimal.in-staging | 6 ++++++ src/config/torrc.sample.in | 6 ++++++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/changes/bug24526 b/changes/bug24526 new file mode 100644 index 000000000..4d69defa9 --- /dev/null +++ b/changes/bug24526 @@ -0,0 +1,4 @@ + o Documentation: + - Document that operators who run more than one relay or bridge are + expected to set MyFamily and ContactInfo correctly. Closes ticket + 24526. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a319aa938..aedc1ad20 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1703,7 +1703,12 @@ is non-zero): descriptors containing these lines and that Google indexes them, so spammers might also collect them. You may want to obscure the fact that it's an email address and/or generate a new address for this - purpose. + purpose. + + + + ContactInfo **must** be set to a working address if you run more than one + relay or bridge. (Really, everybody running a relay or bridge should set + it.) + [[ExitRelay]] **ExitRelay** **0**|**1**|**auto**:: Tells Tor whether to run as an exit relay. If Tor is running as a @@ -1831,7 +1836,11 @@ is non-zero): compromise its concealment. + + When listing a node, it's better to list it by fingerprint than by - nickname: fingerprints are more reliable. + nickname: fingerprints are more reliable. + + + + MyFamily **must** be set correctly if you run more than one relay or + bridge. (That is, every relay should list all the others as described + above.) [[Nickname]] **Nickname** __name__:: Set the server's nickname to \'name'. Nicknames must be between 1 and 19 diff --git a/src/config/torrc.minimal.in-staging b/src/config/torrc.minimal.in-staging index 4fede6dcf..90f91e5cb 100644 --- a/src/config/torrc.minimal.in-staging +++ b/src/config/torrc.minimal.in-staging @@ -132,6 +132,9 @@ ## spammers might also collect them. You may want to obscure the fact that ## it's an email address and/or generate a new address for this purpose. ## Notice that "<" and ">" are recommended. +## +## If you are running multiple relays, you MUST set this option. +## #ContactInfo Random Person <nobody AT example dot com> ## You might also include your PGP or GPG fingerprint if you have one. ## Use the full fingerprint, not just a (short) KeyID: KeyIDs are easy @@ -161,6 +164,9 @@ ## See https://www.torproject.org/docs/faq#MultipleRelays ## However, you should never include a bridge's fingerprint here, as it would ## break its concealability and potentially reveal its IP/TCP address. +## +## If you are running multiple relays, you MUST set this option. +## #MyFamily $keyid,$keyid,... ## Uncomment this if you want your relay to allow IPv6 exit traffic. diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 865e9f660..4e183478e 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -136,6 +136,9 @@ ## descriptors containing these lines and that Google indexes them, so ## spammers might also collect them. You may want to obscure the fact that ## it's an email address and/or generate a new address for this purpose. +## +## If you are running multiple relays, you MUST set this option. +## #ContactInfo Random Person <nobody AT example dot com> ## You might also include your PGP or GPG fingerprint if you have one: #ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com> @@ -162,6 +165,9 @@ ## https://www.torproject.org/docs/faq#MultipleRelays ## However, you should never include a bridge's fingerprint here, as it would ## break its concealability and potentially reveal its IP/TCP address. +## +## If you are running multiple relays, you MUST set this option. +## #MyFamily $keyid,$keyid,... ## Uncomment this if you do *not* want your relay to allow any exit traffic.

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 12 Jan '18

12 Jan '18

commit 1f65a2310a986a6067348b0a1f440d69b28dcbe7 Merge: c80b5336d db5aa54a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 11 20:00:39 2018 -0500 Merge branch 'maint-0.3.2'

1 0

[tor/maint-0.3.2] Reword requirement to set Myfamily correctly
by nickm＠torproject.org 12 Jan '18

12 Jan '18

commit db5aa54a422cd45b690293a0c618e6275e1c3608 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Thu Jan 11 22:03:14 2018 +0100 Reword requirement to set Myfamily correctly --- doc/tor.1.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index aedc1ad20..b647fd7c0 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1838,9 +1838,8 @@ is non-zero): When listing a node, it's better to list it by fingerprint than by nickname: fingerprints are more reliable. + + - MyFamily **must** be set correctly if you run more than one relay or - bridge. (That is, every relay should list all the others as described - above.) + If you run more than one relay, the MyFamily option on each relay + **must** list all other relays, as described above. [[Nickname]] **Nickname** __name__:: Set the server's nickname to \'name'. Nicknames must be between 1 and 19

1 0

[tor/release-0.3.2] Reword requirement to set Myfamily correctly
by nickm＠torproject.org 12 Jan '18

12 Jan '18

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 12 Jan '18

12 Jan '18

commit dbea64aab67d2471653a6f8ce2b974e68df2ed11 Merge: 01d6e23f7 db5aa54a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 11 20:00:43 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24526 | 4 ++++ doc/tor.1.txt | 12 ++++++++++-- src/config/torrc.minimal.in-staging | 6 ++++++ src/config/torrc.sample.in | 6 ++++++ 4 files changed, 26 insertions(+), 2 deletions(-)

1 0

[tor/master] Reword requirement to set Myfamily correctly
by nickm＠torproject.org 12 Jan '18

12 Jan '18

1 0

[tor/release-0.3.2] Note contactinfo and myfamily as required in more places
by nickm＠torproject.org 12 Jan '18

12 Jan '18

1 0

[tor/master] Merge branch 'bug24582'
by nickm＠torproject.org 12 Jan '18

12 Jan '18

commit a3d1c38ea6e62dfd01771c39124b703807f22393 Merge: 42751e212 e18840f61 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 11 19:57:57 2018 -0500 Merge branch 'bug24582' changes/bug24582 | 4 ++++ src/tools/tor-resolve.c | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-)

1 0

[tor/master] Fix the log-severities memory-leak in tor-resolve.c
by nickm＠torproject.org 12 Jan '18

12 Jan '18

commit e18840f619c274cdca476e741ba3edecefbcc3f7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 11:49:57 2017 -0500 Fix the log-severities memory-leak in tor-resolve.c Also, rename the variable to have a more manageable name, and make its scope more clear. Fixes bug 24582; bugfix on 0.2.1.1-alpha. --- changes/bug24582 | 4 ++++ src/tools/tor-resolve.c | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/changes/bug24582 b/changes/bug24582 new file mode 100644 index 000000000..8317a082c --- /dev/null +++ b/changes/bug24582 @@ -0,0 +1,4 @@ + o Minor bugfixes (debugging, memory leaks): + - Fix a harmless memory leak in tor-resolve. Fixes bug 24582; + bugfix on 0.2.1.1-alpha. + diff --git a/src/tools/tor-resolve.c b/src/tools/tor-resolve.c index 1e2409a13..966b88b3e 100644 --- a/src/tools/tor-resolve.c +++ b/src/tools/tor-resolve.c @@ -347,7 +347,6 @@ main(int argc, char **argv) int n_args; tor_addr_t result; char *result_hostname = NULL; - log_severity_list_t *s = tor_malloc_zero(sizeof(log_severity_list_t)); init_logging(1); sandbox_disable_getaddrinfo_cache(); @@ -398,11 +397,14 @@ main(int argc, char **argv) usage(); } + log_severity_list_t *severities = + tor_malloc_zero(sizeof(log_severity_list_t)); if (isVerbose) - set_log_severity_config(LOG_DEBUG, LOG_ERR, s); + set_log_severity_config(LOG_DEBUG, LOG_ERR, severities); else - set_log_severity_config(LOG_WARN, LOG_ERR, s); - add_stream_log(s, "<stderr>", fileno(stderr)); + set_log_severity_config(LOG_WARN, LOG_ERR, severities); + add_stream_log(severities, "<stderr>", fileno(stderr)); + tor_free(severities); if (n_args == 1) { log_debug(LD_CONFIG, "defaulting to localhost");

1 0

[meek/master] Show an error when missing a meek-client command line.
by dcf＠torproject.org 11 Jan '18

11 Jan '18

commit dcfbef8d459adf916f5c4ce8c6ff4ff777be06ff Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jan 11 13:04:34 2018 -0800 Show an error when missing a meek-client command line. Running meek-client-torbrowser without arguments would panic as it tried to index the nonexistent arguments. 2018/01/11 21:02:07 running firefox command ["firefox" "--invisible" "-no-remote" "-profile" "TorBrowser/Data/Browser/profile.meek-http-helper"] 2018/01/11 21:02:07 firefox started with pid 23721 2018/01/11 21:02:08 killing PID 23721 panic: runtime error: index out of range goroutine 1 [running]: panic(0x4e95a0, 0xc42000a110) /usr/lib/go-1.7/src/runtime/panic.go:500 +0x1a1 main.runMeekClient(0xc420010589, 0xf, 0xc42000a2c0, 0x0, 0x0, 0x0, 0x10, 0xc42000e440) meek-client-torbrowser.go:267 +0x416 main.main() meek-client-torbrowser.go:354 +0x3d2 --- meek-client-torbrowser/meek-client-torbrowser.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meek-client-torbrowser/meek-client-torbrowser.go b/meek-client-torbrowser/meek-client-torbrowser.go index 691a566..db35080 100644 --- a/meek-client-torbrowser/meek-client-torbrowser.go +++ b/meek-client-torbrowser/meek-client-torbrowser.go @@ -296,6 +296,11 @@ func main() { log.SetOutput(f) } + meekClientCommandLine := flag.Args() + if len(meekClientCommandLine) == 0 { + log.Fatal("need a meek-client command line") + } + // By default, writes to file descriptor 1 and 2 when the descriptor has // been closed will terminate the program with a SIGPIPE signal. This is // a problem because the default log destination is stderr (file @@ -351,7 +356,7 @@ func main() { } // Start meek-client with the helper address. - meekClientCmd, err := runMeekClient(helperAddr, flag.Args()) + meekClientCmd, err := runMeekClient(helperAddr, meekClientCommandLine) if err != nil { log.Print(err) return

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits January 2018