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

[tor/master] Merge remote-tracking branch 'tor-github/pr/741' into maint-0.4.0
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 04cb2d4010f131c970d0cf3ba56c9d752b8facb9 Merge: 2300a619a 9b7cdd23d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 16:14:51 2019 -0400 Merge remote-tracking branch 'tor-github/pr/741' into maint-0.4.0 doc/tor.1.txt | 13 +++++++------ src/config/torrc.sample.in | 21 ++++++++++++++++----- 2 files changed, 23 insertions(+), 11 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 851e881f01355b0290e79100c09dbedd425f8946 Merge: a56d7e37a 9a97b5ff5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 16:12:07 2019 -0400 Merge remote-tracking branch 'tor-github/pr/971' into maint-0.4.0 .travis.yml | 1 + changes/ticket30234 | 2 ++ 2 files changed, 3 insertions(+)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit a56d7e37aa8f52397f9fd762d07b85f3360afd2a Merge: 00108b75d 0c451b31d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 16:10:51 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0 changes/bug30452 | 3 +++ doc/tor.1.txt | 4 ++++ src/app/config/config.c | 13 +++++++++++++ src/app/main/main.c | 1 + src/feature/dirauth/authmode.h | 4 ++++ 5 files changed, 25 insertions(+) diff --cc doc/tor.1.txt index c2df7687f,f46929897..b9a48b680 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -88,10 -88,12 +88,14 @@@ COMMAND-LINE OPTION List all valid options that are scheduled to become obsolete in a future version. (This is a warning, not a promise.) + [[opt-list-modules]] **--list-modules**:: + For each optional module, list whether or not it has been compiled + into Tor. (Any module not listed is not optional in this version of Tor.) + [[opt-version]] **--version**:: - Display Tor version and exit. + Display Tor version and exit. The output is a single line of the format + "Tor version [version number]." (The version number format + is as specified in version-spec.txt.) [[opt-quiet]] **--quiet**|**--hush**:: Override the default console log. By default, Tor starts out logging

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 2300a619a548ed529551c731dd706fea0b2a0a20 Merge: 851e881f0 245dccb77 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 16:13:53 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.4.0 changes/ticket30454 | 10 ++++++++ src/feature/hs/hs_cell.c | 16 +++++++------ src/feature/hs/hs_cell.h | 13 ---------- src/feature/hs/hs_client.c | 18 +++++++------- src/feature/hs/hs_intropoint.c | 27 +++++++++++---------- src/feature/hs/hs_intropoint.h | 15 ------------ src/test/test_hs_cell.c | 2 +- src/test/test_hs_intropoint.c | 4 ++-- src/trunnel/hs/cell_introduce1.c | 44 +++++++++++++--------------------- src/trunnel/hs/cell_introduce1.h | 7 ++++++ src/trunnel/hs/cell_introduce1.trunnel | 21 +++++++++++++--- 11 files changed, 87 insertions(+), 90 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit e51b57ee047420b929c7d58de70df6ea5ca77565 Merge: 04cb2d401 802ac8ad6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 16:16:34 2019 -0400 Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0 changes/bug30189 | 4 ++++ src/lib/log/util_bug.c | 14 ++++++++++++++ src/lib/log/util_bug.h | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit d63c17f2afb810f5db896b10909fe9ff2bfe7cf9 Merge: e51b57ee0 b05b165a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 16:22:29 2019 -0400 Merge remote-tracking branch 'tor-github/pr/989' into maint-0.4.0 .travis.yml | 22 +--------------------- changes/ticket30213 | 3 +++ 2 files changed, 4 insertions(+), 21 deletions(-)

1 0

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

05 Jun '19

commit 3c2b2f072f996ba958ed5b6e07d3bac02291fc4a Merge: 30f0e993c 6a6f7eb67 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 16:24:10 2019 -0400 Merge branch 'maint-0.4.0'

1 0

[tor/release-0.4.0] Use a tor_abort_() wrapper in our util_bug.h macros
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 802ac8ad618a0674c26bb973a2277e07b20f8c7b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Apr 15 14:16:23 2019 -0400 Use a tor_abort_() wrapper in our util_bug.h macros Previously, our use of abort() would break anywhere that we didn't include stdlib.h. This was especially troublesome in case where tor_assert_nonfatal() was used with ALL_BUGS_ARE_FATAL, since that one seldom gets tested. As an alternative, we could have just made this header include stdlib.h. But that seems bloaty. Fixes bug 30189; bugfix on 0.3.4.1-alpha. --- changes/bug30189 | 4 ++++ src/lib/log/util_bug.c | 14 ++++++++++++++ src/lib/log/util_bug.h | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/changes/bug30189 b/changes/bug30189 new file mode 100644 index 000000000..f8c932a5f --- /dev/null +++ b/changes/bug30189 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation, unusual configuration): + - Avoid failures when building with ALL_BUGS_ARE_FAILED due to + missing declarations of abort(), and prevent other such failures + in the future. Fixes bug 30189; bugfix on 0.3.4.1-alpha. diff --git a/src/lib/log/util_bug.c b/src/lib/log/util_bug.c index f42d2d2ab..c65a91ae9 100644 --- a/src/lib/log/util_bug.c +++ b/src/lib/log/util_bug.c @@ -19,6 +19,7 @@ #include "lib/string/printf.h" #include <string.h> +#include <stdlib.h> #ifdef TOR_UNIT_TESTS static void (*failed_assertion_cb)(void) = NULL; @@ -120,6 +121,19 @@ tor_bug_occurred_(const char *fname, unsigned int line, #endif } +/** + * Call the abort() function to kill the current process with a fatal + * error. + * + * (This is a separate function so that we declare it in util_bug.h without + * including stdlib in all the users of util_bug.h) + **/ +void +tor_abort_(void) +{ + abort(); +} + #ifdef _WIN32 /** Take a filename and return a pointer to its final element. This * function is called on __FILE__ to fix a MSVC nit where __FILE__ diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index 18d40bbf3..2a4d68127 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -99,7 +99,7 @@ if (ASSERT_PREDICT_LIKELY_(expr)) { \ } else { \ tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, #expr); \ - abort(); \ + tor_abort_(); \ } STMT_END #endif /* defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) */ @@ -107,7 +107,7 @@ STMT_BEGIN { \ tor_assertion_failed_(SHORT_FILE__, __LINE__, __func__, \ "line should be unreached"); \ - abort(); \ + tor_abort_(); \ } STMT_END /* Non-fatal bug assertions. The "unreached" variants mean "this line should @@ -141,7 +141,7 @@ #define BUG(cond) \ (ASSERT_PREDICT_UNLIKELY_(cond) ? \ (tor_assertion_failed_(SHORT_FILE__,__LINE__,__func__,"!("#cond")"), \ - abort(), 1) \ + tor_abort_(), 1) \ : 0) #elif defined(TOR_UNIT_TESTS) && defined(DISABLE_ASSERTS_IN_UNIT_TESTS) #define tor_assert_nonfatal_unreached() STMT_NIL @@ -226,6 +226,8 @@ void tor_bug_occurred_(const char *fname, unsigned int line, const char *func, const char *expr, int once); +void tor_abort_(void) ATTR_NORETURN; + #ifdef _WIN32 #define SHORT_FILE__ (tor_fix_source_file(__FILE__)) const char *tor_fix_source_file(const char *fname);

1 0

[tor/release-0.4.0] doc: update the man page and sample torrc for ExitRelay
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 9b7cdd23deb5830cce794ce6e901b82fa094dd9f Author: teor <teor(a)torproject.org> Date: Thu Feb 28 11:22:20 2019 +1000 doc: update the man page and sample torrc for ExitRelay We changed the default of ExitRelay in #21530 in 0.3.5.1-alpha, but forgot to update the documentation. Closes 29612. --- doc/tor.1.txt | 13 +++++++------ src/config/torrc.sample.in | 21 ++++++++++++++++----- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 573fdf221..60997ad16 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1849,15 +1849,16 @@ is non-zero): [[ExitRelay]] **ExitRelay** **0**|**1**|**auto**:: Tells Tor whether to run as an exit relay. If Tor is running as a non-bridge server, and ExitRelay is set to 1, then Tor allows traffic to - exit according to the ExitPolicy option (or the default ExitPolicy if - none is specified). + + exit according to the ExitPolicy option, the ReducedExitPolicy option, + or the default ExitPolicy (if no other exit policy option is specified). + + If ExitRelay is set to 0, no traffic is allowed to - exit, and the ExitPolicy option is ignored. + + exit, and the ExitPolicy and ReducedExitPolicy options are ignored. + + - If ExitRelay is set to "auto", then Tor behaves as if it were set to 1, but - warns the user if this would cause traffic to exit. In a future version, - the default value will be 0. (Default: auto) + If ExitRelay is set to "auto", then Tor checks the ExitPolicy and + ReducedExitPolicy options. If either is set, Tor behaves as if ExitRelay + were set to 1. If neither exit policy option is set, Tor behaves as if + ExitRelay were set to 0. (Default: auto) [[ExitPolicy]] **ExitPolicy** __policy__,__policy__,__...__:: Set an exit policy for this server. Each policy is of the form diff --git a/src/config/torrc.sample.in b/src/config/torrc.sample.in index 8d56b0896..c2ae707e9 100644 --- a/src/config/torrc.sample.in +++ b/src/config/torrc.sample.in @@ -1,5 +1,5 @@ ## Configuration file for a typical Tor user -## Last updated 22 December 2017 for Tor 0.3.2.8-rc. +## Last updated 28 February 2019 for Tor 0.3.5.1-alpha. ## (may or may not work for much older or much newer versions of Tor.) ## ## Lines that begin with "## " try to explain what's going on. Lines @@ -172,14 +172,25 @@ ## Note: do not use MyFamily on bridge relays. #MyFamily $keyid,$keyid,... -## Uncomment this if you do *not* want your relay to allow any exit traffic. -## (Relays allow exit traffic by default.) -#ExitRelay 0 +## Uncomment this if you want your relay to be an exit, with the default +## exit policy (or whatever exit policy you set below). +## (If ReducedExitPolicy or ExitPolicy are set, relays are exits. +## If neither exit policy option is set, relays are non-exits.) +#ExitRelay 1 ## Uncomment this if you want your relay to allow IPv6 exit traffic. -## (Relays only allow IPv4 exit traffic by default.) +## You must also set ExitRelay, ReducedExitPolicy, or ExitPolicy to make your +## relay into an exit. +## (Relays do not allow any exit traffic by default.) #IPv6Exit 1 +## Uncomment this if you want your relay to be an exit, with a reduced set +## of exit ports. +#ReducedExitPolicy 1 + +## Uncomment these lines if you want your relay to be an exit, with the +## specified set of exit IPs and ports. +## ## A comma-separated list of exit policies. They're considered first ## to last, and the first match wins. ##

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0
by nickm＠torproject.org 05 Jun '19

05 Jun '19

commit 6a6f7eb6718f22da80596a35e7774b075a417e97 Merge: d63c17f2a 821dd5458 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 5 16:22:52 2019 -0400 Merge remote-tracking branch 'tor-github/pr/988' into maint-0.4.0 changes/bug30316 | 4 ++++ src/feature/dirauth/dirvote.c | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-)

1 0