November 2018 - tor-commits - lists.torproject.org

[translation/tba-android_stringsdtd] Update translations for tba-android_stringsdtd
by translation＠torproject.org 14 Nov '18

14 Nov '18

commit c1afbe351355522ff8becdd6cd2d15069eec83aa Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 14 12:46:54 2018 +0000 Update translations for tba-android_stringsdtd --- es/android_strings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/android_strings.dtd b/es/android_strings.dtd index 311c4f1be..9154a3d9b 100644 --- a/es/android_strings.dtd +++ b/es/android_strings.dtd @@ -380,7 +380,7 @@ <!ENTITY pref_private_data_passwords2 "Saved logins"> <!ENTITY pref_private_data_cache "Caché"> <!ENTITY pref_private_data_offlineApps "Offline website data"> -<!ENTITY pref_private_data_siteSettings2 "Site settings"> +<!ENTITY pref_private_data_siteSettings2 "Propiedades del sitio"> <!ENTITY pref_private_data_downloadFiles2 "Descargas"> <!ENTITY pref_private_data_syncedTabs "Synced tabs">

1 0

[tor/maint-0.3.5] Fix Doxyfile for 0.3.5 source tree moves
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit 763ccd092899c50392681f0f682635efe2b22c4f Author: Taylor Yu <catalyst(a)torproject.org> Date: Tue Nov 13 16:50:00 2018 -0600 Fix Doxyfile for 0.3.5 source tree moves Make Doxygen work again after the 0.3.5 source tree moves. Fixes bug 28435; bugfix on 0.3.5.1-alpha. --- Doxyfile.in | 2 +- changes/bug28435 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Doxyfile.in b/Doxyfile.in index 8d8b959fb..4caf42109 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -555,7 +555,7 @@ FILE_PATTERNS = *.c \ # should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. -RECURSIVE = NO +RECURSIVE = YES # The EXCLUDE tag can be used to specify files and/or directories that should # excluded from the INPUT source files. This way you can easily exclude a diff --git a/changes/bug28435 b/changes/bug28435 new file mode 100644 index 000000000..2a886cb8b --- /dev/null +++ b/changes/bug28435 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Make Doxygen work again after the 0.3.5 source tree moves. + Fixes bug 28435; bugfix on 0.3.5.1-alpha.

1 0

[tor/master] Fix Doxyfile for 0.3.5 source tree moves
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit 763ccd092899c50392681f0f682635efe2b22c4f Author: Taylor Yu <catalyst(a)torproject.org> Date: Tue Nov 13 16:50:00 2018 -0600 Fix Doxyfile for 0.3.5 source tree moves Make Doxygen work again after the 0.3.5 source tree moves. Fixes bug 28435; bugfix on 0.3.5.1-alpha. --- Doxyfile.in | 2 +- changes/bug28435 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Doxyfile.in b/Doxyfile.in index 8d8b959fb..4caf42109 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -555,7 +555,7 @@ FILE_PATTERNS = *.c \ # should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. -RECURSIVE = NO +RECURSIVE = YES # The EXCLUDE tag can be used to specify files and/or directories that should # excluded from the INPUT source files. This way you can easily exclude a diff --git a/changes/bug28435 b/changes/bug28435 new file mode 100644 index 000000000..2a886cb8b --- /dev/null +++ b/changes/bug28435 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Make Doxygen work again after the 0.3.5 source tree moves. + Fixes bug 28435; bugfix on 0.3.5.1-alpha.

1 0

[tor/release-0.3.5] Fix Doxyfile for 0.3.5 source tree moves
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit 763ccd092899c50392681f0f682635efe2b22c4f Author: Taylor Yu <catalyst(a)torproject.org> Date: Tue Nov 13 16:50:00 2018 -0600 Fix Doxyfile for 0.3.5 source tree moves Make Doxygen work again after the 0.3.5 source tree moves. Fixes bug 28435; bugfix on 0.3.5.1-alpha. --- Doxyfile.in | 2 +- changes/bug28435 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Doxyfile.in b/Doxyfile.in index 8d8b959fb..4caf42109 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -555,7 +555,7 @@ FILE_PATTERNS = *.c \ # should be searched for input files as well. Possible values are YES and NO. # If left blank NO is used. -RECURSIVE = NO +RECURSIVE = YES # The EXCLUDE tag can be used to specify files and/or directories that should # excluded from the INPUT source files. This way you can easily exclude a diff --git a/changes/bug28435 b/changes/bug28435 new file mode 100644 index 000000000..2a886cb8b --- /dev/null +++ b/changes/bug28435 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Make Doxygen work again after the 0.3.5 source tree moves. + Fixes bug 28435; bugfix on 0.3.5.1-alpha.

1 0

[tor/master] Merge branch 'maint-0.3.5'
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit c7f09554eb0bb3dc9413adb255a45e4e94add1ef Merge: 586c3a7c9 763ccd092 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 14 07:45:58 2018 -0500 Merge branch 'maint-0.3.5' Doxyfile.in | 2 +- changes/bug28435 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit 18df0ffbf3856e341d4df3e46d9cc8e324154826 Merge: 1ba17cc81 763ccd092 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 14 07:45:58 2018 -0500 Merge branch 'maint-0.3.5' into release-0.3.5 Doxyfile.in | 2 +- changes/bug28435 | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] doc: Remove an outdated sentence from KeepalivePeriod in the man page
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit c793cf338b92ba2aee0d556a041fefeb2656ee04 Author: teor <teor(a)torproject.org> Date: Wed Nov 7 18:46:39 2018 +1000 doc: Remove an outdated sentence from KeepalivePeriod in the man page --- doc/tor.1.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2d5237c84..019c8af75 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -635,9 +635,7 @@ GENERAL OPTIONS [[KeepalivePeriod]] **KeepalivePeriod** __NUM__:: To keep firewalls from expiring connections, send a padding keepalive cell - every NUM seconds on open connections that are in use. If the connection - has no open circuits, it will instead be closed after NUM seconds of - idleness. (Default: 5 minutes) + every NUM seconds on open connections that are in use. (Default: 5 minutes) [[Log]] **Log** __minSeverity__[-__maxSeverity__] **stderr**|**stdout**|**syslog**:: Send all messages between __minSeverity__ and __maxSeverity__ to the standard

1 0

[tor/maint-0.3.5] doc: Remove an outdated sentence from KeepalivePeriod in the man page
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit c793cf338b92ba2aee0d556a041fefeb2656ee04 Author: teor <teor(a)torproject.org> Date: Wed Nov 7 18:46:39 2018 +1000 doc: Remove an outdated sentence from KeepalivePeriod in the man page --- doc/tor.1.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2d5237c84..019c8af75 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -635,9 +635,7 @@ GENERAL OPTIONS [[KeepalivePeriod]] **KeepalivePeriod** __NUM__:: To keep firewalls from expiring connections, send a padding keepalive cell - every NUM seconds on open connections that are in use. If the connection - has no open circuits, it will instead be closed after NUM seconds of - idleness. (Default: 5 minutes) + every NUM seconds on open connections that are in use. (Default: 5 minutes) [[Log]] **Log** __minSeverity__[-__maxSeverity__] **stderr**|**stdout**|**syslog**:: Send all messages between __minSeverity__ and __maxSeverity__ to the standard

1 0

[tor/master] comment: Fix a typo in nodes_in_same_family()
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit a7aa3f76ecfceb4f7efaab4bc5744e422735c396 Author: teor <teor(a)torproject.org> Date: Wed Nov 7 18:47:42 2018 +1000 comment: Fix a typo in nodes_in_same_family() --- src/feature/nodelist/nodelist.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index a98a5c865..c77ef443d 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -1932,7 +1932,7 @@ nodes_in_same_family(const node_t *node1, const node_t *node2) return 1; } - /* Are they in the same option because the user says they are? */ + /* Are they in the same family because the user says they are? */ if (options->NodeFamilySets) { SMARTLIST_FOREACH(options->NodeFamilySets, const routerset_t *, rs, { if (routerset_contains_node(rs, node1) &&

1 0

[tor/maint-0.3.5] comment: circuit_list_path_impl() does not check Named any more
by nickm＠torproject.org 14 Nov '18

14 Nov '18

commit 9daf06d171035582c0fca3516f265a59fffc7bbf Author: teor <teor(a)torproject.org> Date: Wed Nov 7 18:59:08 2018 +1000 comment: circuit_list_path_impl() does not check Named any more --- src/core/or/circuitbuild.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index a69457571..da137accc 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -255,9 +255,8 @@ get_unique_circ_id_by_chan(channel_t *chan) /** If verbose is false, allocate and return a comma-separated list of * the currently built elements of circ. If verbose is true, also * list information about link status in a more verbose format using spaces. - * If verbose_names is false, give nicknames for Named routers and hex - * digests for others; if verbose_names is true, use $DIGEST=Name style - * names. + * If verbose_names is false, give hex digests; if verbose_names + * is true, use $DIGEST=Name style names. */ static char * circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names)

1 0