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

[tor/master] Merge remote-tracking branch 'pastly/ticket19122'
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit 4e3f9c1f3af6292f30799f005f6df8f9c1bc7fee Merge: 4402289 e90bd48 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 11:56:46 2016 -0400 Merge remote-tracking branch 'pastly/ticket19122' changes/19122 | 3 +++ doc/tor.1.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Change UID to Username in man page
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit e90bd48c2f74026279ababab89a47633f32f982c Author: Matt Traudt <sirmatt(a)ksu.edu> Date: Tue Sep 6 11:37:59 2016 -0400 Change UID to Username in man page --- changes/19122 | 3 +++ doc/tor.1.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/19122 b/changes/19122 new file mode 100644 index 0000000..cface80 --- /dev/null +++ b/changes/19122 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - man page incorrectly states the User option takes a UID when it really + takes a username. Fixes bug 19122. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0687991..cbd11a5 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -668,7 +668,7 @@ GENERAL OPTIONS relay, all log messages generated when acting as a relay are sanitized, but all messages generated when acting as a client are not. (Default: 1) -[[User]] **User** __UID__:: +[[User]] **User** __Username__:: On startup, setuid to this user and setgid to their primary group. [[KeepBindCapabilities]] **KeepBindCapabilities** **0**|**1**|**auto**::

1 0

[tor-messenger-build/updater] Apply patch for #13252 to all platforms
by sukhbir＠torproject.org 06 Sep '16

06 Sep '16

commit d280b06001d930c277d1536c982d472ce6d1b244 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Sep 6 11:54:23 2016 -0400 Apply patch for #13252 to all platforms --- projects/instantbird/config | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index b421403..9b72599 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -135,7 +135,6 @@ input_files: - filename: Improve-profile-access-bug-14631-first.mozpatch - filename: Improve-profile-access-bug-14631-second.mozpatch - filename: Mac-outside-app-data-bug-13252.mozpatch - enable: '[% c("var/osx") %]' - filename: Sign-MAR-files-bug-13379.mozpatch - filename: Update-load-local-changes-bug-14392-first.mozpatch - filename: Update-load-local-changes-bug-16940-second.mozpatch

1 0

[tor-messenger-build/master] Apply patch for #13252 to all platforms
by sukhbir＠torproject.org 06 Sep '16

06 Sep '16

commit d280b06001d930c277d1536c982d472ce6d1b244 Author: Sukhbir Singh <sukhbir(a)torproject.org> Date: Tue Sep 6 11:54:23 2016 -0400 Apply patch for #13252 to all platforms --- projects/instantbird/config | 1 - 1 file changed, 1 deletion(-) diff --git a/projects/instantbird/config b/projects/instantbird/config index b421403..9b72599 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -135,7 +135,6 @@ input_files: - filename: Improve-profile-access-bug-14631-first.mozpatch - filename: Improve-profile-access-bug-14631-second.mozpatch - filename: Mac-outside-app-data-bug-13252.mozpatch - enable: '[% c("var/osx") %]' - filename: Sign-MAR-files-bug-13379.mozpatch - filename: Update-load-local-changes-bug-14392-first.mozpatch - filename: Update-load-local-changes-bug-16940-second.mozpatch

1 0

[tor/master] Merge remote-tracking branch 'sebastian/bug20065'
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit 440228907da9aff06562c4193ab9551b9fc5bad8 Merge: 55a2bfb 74d710e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 6 10:12:42 2016 -0400 Merge remote-tracking branch 'sebastian/bug20065' changes/bug20065 | 5 +++++ src/or/router.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-)

1 0

[tor/master] Give useful error if authority_signing_key doesn't exist
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit 74d710e7dc93c5449e4c88ffa0048afdb3c31e8f Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Sep 6 00:11:45 2016 +0200 Give useful error if authority_signing_key doesn't exist --- changes/bug20065 | 5 +++++ src/or/router.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/changes/bug20065 b/changes/bug20065 new file mode 100644 index 0000000..cdeb698 --- /dev/null +++ b/changes/bug20065 @@ -0,0 +1,5 @@ + o Minor bugfixes (directory authorities): + - Die with a useful error when the operator forgets to place the + authority_signing_key file into the keys directory. This avoids an + uninformative assert & traceback about having an invalid key. + Fixes bug 20065; bugfix on 0.2.0.1-alpha. diff --git a/src/or/router.c b/src/or/router.c index b664a88..8fa5799 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -452,7 +452,8 @@ init_key_from_file(const char *fname, int generate, int severity, goto error; } } else { - log_info(LD_GENERAL, "No key found in \"%s\"", fname); + tor_log(severity, LD_GENERAL, "No key found in \"%s\"", fname); + goto error; } return prkey; case FN_FILE: @@ -560,7 +561,7 @@ load_authority_keyset(int legacy, crypto_pk_t **key_out, fname = get_datadir_fname2("keys", legacy ? "legacy_signing_key" : "authority_signing_key"); - signing_key = init_key_from_file(fname, 0, LOG_INFO, 0); + signing_key = init_key_from_file(fname, 0, LOG_ERR, 0); if (!signing_key) { log_warn(LD_DIR, "No version 3 directory key found in %s", fname); goto done;

1 0

[tor/master] Fix a comment typo in smartlist_get_most_frequent_()
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit 41ad244dd6bdda4cd49f0e7da46e56724c07cf6a Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed Feb 10 15:20:46 2016 +1100 Fix a comment typo in smartlist_get_most_frequent_() --- src/common/container.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/container.c b/src/common/container.c index ddf3baf..ec59dcc 100644 --- a/src/common/container.c +++ b/src/common/container.c @@ -544,7 +544,7 @@ smartlist_sort(smartlist_t *sl, int (*compare)(const void **a, const void **b)) /** Given a smartlist <b>sl</b> sorted with the function <b>compare</b>, * return the most frequent member in the list. Break ties in favor of * later elements. If the list is empty, return NULL. If count_out is - * non-null, set it to the most frequent member. + * non-null, set it to the count of the most frequent member. */ void * smartlist_get_most_frequent_(const smartlist_t *sl,

1 0

[tor/master] Fix a space error in the man page
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit b3dfd9defbb2ac728eeffd2bc310304f7e59539c Author: teor <teor2345(a)gmail.com> Date: Tue Sep 6 17:48:31 2016 +1000 Fix a space error in the man page --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index a0a0bcb..4221544 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2111,7 +2111,7 @@ on the public Tor network. When this option is set in addition to **AuthoritativeDirectory**, Tor generates version 3 network statuses and serves descriptors, etc as described in dir-spec.txt file of https://spec.torproject.org/[torspec] - (for Tor clients and servers running atleast 0.2.0.x). + (for Tor clients and servers running at least 0.2.0.x). [[VersioningAuthoritativeDirectory]] **VersioningAuthoritativeDirectory** **0**|**1**:: When this option is set to 1, Tor adds information on which versions of

1 0

[tor/master] Fix an indentation issue in rend_config_services
by nickm＠torproject.org 06 Sep '16

06 Sep '16

commit 55a2bfb05609a790d47119d54a99d05380360131 Author: teor <teor2345(a)gmail.com> Date: Tue Sep 6 17:48:49 2016 +1000 Fix an indentation issue in rend_config_services --- src/or/rendservice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 12af748..8d3a7d7 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -508,7 +508,7 @@ rend_config_services(const or_options_t *options, int validate_only) if (!strcasecmp(line->key, "HiddenServiceDir")) { if (service) { /* register the one we just finished parsing */ if (validate_only) - rend_service_free(service); + rend_service_free(service); else rend_add_service(service); }

1 0

[tor-launcher/master] fixup! Bug 14272: Make Tor Launcher work with Unix Domain Socket option
by gk＠torproject.org 06 Sep '16

06 Sep '16

commit fa4e114a20067810af0c5cc6a57aa6e849386418 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Sep 6 07:36:04 2016 +0000 fixup! Bug 14272: Make Tor Launcher work with Unix Domain Socket option Permissions for the Tor data directory are too permissive for control sockets. We adapt them (and those for creating files) to the ones used for Linux bundles by default. This fixes: #20076 and #20075 as FileUtils is not needed anymore (and hence can't be missing in tl-utils.jsm). --- src/components/tl-process.js | 2 -- src/modules/tl-util.jsm | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index c1bbdda..db074b4 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -16,8 +16,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherUtil", "resource://torlauncher/modules/tl-util.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "TorLauncherLogger", "resource://torlauncher/modules/tl-logger.jsm"); -XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", - "resource://gre/modules/FileUtils.jsm"); function TorProcessService() { diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 528b752..85b5fbe 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -513,9 +513,9 @@ let TorLauncherUtil = // Public try { if ("tordatadir" == aTorFileType) - f.create(f.DIRECTORY_TYPE, FileUtils.PERMS_DIRECTORY); + f.create(f.DIRECTORY_TYPE, 0700); else - f.create(f.NORMAL_FILE_TYPE, FileUtils.PERMS_FILE); + f.create(f.NORMAL_FILE_TYPE, 0600); } catch (e) {

1 0