tor-commits November 2019

tor-commits@lists.torproject.org

20 participants
2923 discussions

[lego/master] Donate button url should not be localized
by hiro＠torproject.org 11 Nov '19

11 Nov '19

commit 7b0eb82c0e5814c6cf620c48acff0b9517ea4f81 Author: hiro <hiro(a)torproject.org> Date: Mon Nov 11 15:19:31 2019 +0100 Donate button url should not be localized --- templates/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/navbar.html b/templates/navbar.html index 498b005..a699835 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -14,7 +14,7 @@ <span class="sr-only">Tor Logo</span> </a> - <a href="https://donate.torproject.org/{{ '/'|url(alt=this.alt) }}" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a> + <a href="https://donate.torproject.org/" title="{{ _("Donate") }}"><h4><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></h4></a> <label for="nav-toggle"> <a class="btn btn-lg btn-primary navbar-toggler text-white p-3" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">

1 0

[onionoo/master] Remove disappearing family members.
by karsten＠torproject.org 11 Nov '19

11 Nov '19

commit 941ffd691b7ddaa7d4ae692746f056bcabdfc1d7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 11 10:59:13 2019 +0100 Remove disappearing family members. When a relay stops writing any family members into its server descriptor we never cleared old family members but kept them forever. We should do that. Fixes #28314. --- CHANGELOG.md | 7 +++++++ .../metrics/onionoo/updater/NodeDetailsStatusUpdater.java | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b5c4c38..dc93ec6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changes in version 7.0-1.2?.? - 2019-1?-?? + + * Medium changes + - Remove declared/alleged family members after they disappear from + server descriptors. + + # Changes in version 7.0-1.21.1 - 2019-11-09 * Minor changes diff --git a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java index a5f16e4..b25459d 100644 --- a/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java +++ b/src/main/java/org/torproject/metrics/onionoo/updater/NodeDetailsStatusUpdater.java @@ -172,8 +172,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, detailsStatus.setExitPolicy(descriptor.getExitPolicyLines()); detailsStatus.setContact(descriptor.getContact()); detailsStatus.setPlatform(descriptor.getPlatform()); + SortedSet<String> declaredFamily = new TreeSet<>(); if (descriptor.getFamilyEntries() != null) { - SortedSet<String> declaredFamily = new TreeSet<>(); for (String familyMember : descriptor.getFamilyEntries()) { if (familyMember.startsWith("$") && familyMember.length() >= 41) { declaredFamily.add( @@ -182,8 +182,8 @@ public class NodeDetailsStatusUpdater implements DescriptorListener, declaredFamily.add(familyMember); } } - this.declaredFamilies.put(fingerprint, declaredFamily); } + this.declaredFamilies.put(fingerprint, declaredFamily); if (descriptor.getIpv6DefaultPolicy() != null && (descriptor.getIpv6DefaultPolicy().equals("accept") || descriptor.getIpv6DefaultPolicy().equals("reject"))

1 0

[metrics-web/master] Document newly added index.json fields.
by karsten＠torproject.org 11 Nov '19

11 Nov '19

commit 4259a6dffe28ad26a3b50c079e155e57b40388a9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 11 15:06:25 2019 +0100 Document newly added index.json fields. Still part of #31204. --- src/main/resources/web/jsps/collector.jsp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/resources/web/jsps/collector.jsp b/src/main/resources/web/jsps/collector.jsp index 414b23f..d56bdfe 100644 --- a/src/main/resources/web/jsps/collector.jsp +++ b/src/main/resources/web/jsps/collector.jsp @@ -913,6 +913,10 @@ Index files use the following custom JSON data format that might still be extend <li><code>"path"</code>: Relative path of the file.</li> <li><code>"size"</code>: Size of the file in bytes.</li> <li><code>"last_modified"</code>: Timestamp when the file was last modified using pattern <code>"YYYY-MM-DD HH:MM"</code> in the UTC timezone.</li> +<li><code>"types"</code>: Descriptor types as found in <code>@type</code> annotations of contained descriptors.</li> +<li><code>"first_published"</code>: Earliest publication timestamp of contained descriptors using pattern <code>"YYYY-MM-DD HH:MM"</code> in the UTC timezone.</li> +<li><code>"last_published"</code>: Latest publication timestamp of contained descriptors using pattern <code>"YYYY-MM-DD HH:MM"</code> in the UTC timezone.</li> +<li><code>"sha256"</code>: SHA-256 digest of this file.</li> </ul></li> </ul>

1 0

[lego/master] Change templates and reduce databags
by hiro＠torproject.org 11 Nov '19

11 Nov '19

commit 98e55dace8bbfc909ec21d36ef9f7eaca687fa15 Author: hiro <hiro(a)torproject.org> Date: Mon Nov 11 14:17:07 2019 +0100 Change templates and reduce databags --- databags/menu.ini | 23 +++++++++++++++++++++++ databags/menu_footer.ini | 15 +++++++++++++++ templates/footer.html | 2 +- templates/navbar.html | 2 +- 4 files changed, 40 insertions(+), 2 deletions(-) diff --git a/databags/menu.ini b/databags/menu.ini new file mode 100644 index 0000000..e7a52b2 --- /dev/null +++ b/databags/menu.ini @@ -0,0 +1,23 @@ +[about] +path = https://www.torproject.org/about/history/ +label = About + +[documentation] +path = https://2019.www.torproject.org/docs/documentation.html.en +label = Documentation + +[support] +path = https://support.torproject.org/ +label = Support + +[community] +path = https://community.torproject.org/ +label = Community + +[blog] +path = https://blog.torproject.org +label = Blog + +[donate] +path = https://donate.torproject.org +label = Donate diff --git a/databags/menu_footer.ini b/databags/menu_footer.ini new file mode 100644 index 0000000..c997390 --- /dev/null +++ b/databags/menu_footer.ini @@ -0,0 +1,15 @@ +[jobs] +path = https://www.torproject.org/about/jobs/ +label = Jobs + +[blog] +path = https://blog.torproject.org +label = Blog + +[contact] +path = https://www.torproject.org/contact/ +label = Contact + +[press] +path = https://www.torproject.org/press/ +label = Press diff --git a/templates/footer.html b/templates/footer.html index 63f9f46..555faed 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -29,7 +29,7 @@ </div> <div class="col-sm-2 mt-5 d-none d-sm-block"> <ul class="nav flex-column mt-sm-5"> - {% set menubag = 'menu_footer+' + this.alt %} + {% set menubag = 'menu_footer' %} {% for id, item in bag(menubag).items() %} <li{% if this.is_child_of(item.path) %} class="nav-item active" {% else %} class="nav-item"{% endif %}> {% set link = site.get(item.path) %} diff --git a/templates/navbar.html b/templates/navbar.html index 96c0961..498b005 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -25,7 +25,7 @@ <div class="collapse navbar-collapse hamburger-menu" id="navbarSupportedContent"> <div class="mx-auto"> <ul class="navbar-nav"> - {% set menubag = 'menu+' + this.alt %} + {% set menubag = 'menu' %} {% for id, item in bag(menubag).items() %} <li{% if this.path == item.path %} class="nav-item active" {% else %} class="nav-item"{% endif %}> {% set link = site.get(item.path) %}

1 0

[tor/master] Doxygen: enable source code browser
by asn＠torproject.org 11 Nov '19

11 Nov '19

commit bd6bd7d28eb2718b6c2bfd9fa60d1a855d177f5d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 5 12:52:28 2019 -0500 Doxygen: enable source code browser --- Doxyfile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Doxyfile.in b/Doxyfile.in index be500bbfa..4569df545 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -984,7 +984,7 @@ USE_MDFILE_AS_MAINPAGE = # also VERBATIM_HEADERS is set to NO. # The default value is: NO. -SOURCE_BROWSER = NO +SOURCE_BROWSER = YES # Setting the INLINE_SOURCES tag to YES will include the body of functions, # classes and enums directly into the documentation. @@ -997,13 +997,13 @@ INLINE_SOURCES = NO # Fortran comments will always remain visible. # The default value is: YES. -STRIP_CODE_COMMENTS = YES +STRIP_CODE_COMMENTS = NO # If the REFERENCED_BY_RELATION tag is set to YES then for each documented # entity all documented functions referencing it will be listed. # The default value is: NO. -REFERENCED_BY_RELATION = NO +REFERENCED_BY_RELATION = YES # If the REFERENCES_RELATION tag is set to YES then for each documented function # all documented entities called/used by that function will be listed.

1 0

[tor/master] Merge branch 'tor-github/pr/1504'
by asn＠torproject.org 11 Nov '19

11 Nov '19

commit 8344776224f83e7438167039d0bbfffe0523123c Merge: 8af8ed72b d7872b775 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Nov 11 14:47:33 2019 +0200 Merge branch 'tor-github/pr/1504' Doxyfile.in | 8 ++++---- doc/include.am | 1 + doc/tor-doxygen.css | 10 ++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-)

1 0

[tor/master] Doxygen: provide a style sheet
by asn＠torproject.org 11 Nov '19

11 Nov '19

commit d7872b775d77fb40a88695b5bea11f751262ad1f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 5 13:04:51 2019 -0500 Doxygen: provide a style sheet This sheet tries to make links to the source code browser less obtrusive. --- Doxyfile.in | 2 +- doc/include.am | 1 + doc/tor-doxygen.css | 10 ++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Doxyfile.in b/Doxyfile.in index 4569df545..a4e4445cc 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -1162,7 +1162,7 @@ HTML_STYLESHEET = # list). For an example see the documentation. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_EXTRA_STYLESHEET = +HTML_EXTRA_STYLESHEET = doc/tor-doxygen.css # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or # other source files which should be copied to the HTML output directory. Note diff --git a/doc/include.am b/doc/include.am index a9d3fa1c9..8651f845e 100644 --- a/doc/include.am +++ b/doc/include.am @@ -47,6 +47,7 @@ EXTRA_DIST+= doc/asciidoc-helper.sh \ $(html_in) $(man_in) $(txt_in) \ doc/state-contents.txt \ doc/torrc_format.txt \ + doc/tor-doxygen.css \ doc/TUNING \ doc/HACKING/README.1st.md \ doc/HACKING/CodingStandards.md \ diff --git a/doc/tor-doxygen.css b/doc/tor-doxygen.css new file mode 100644 index 000000000..97cd1886d --- /dev/null +++ b/doc/tor-doxygen.css @@ -0,0 +1,10 @@ + +p.definition { + font-size: small; + padding-left: 1.5em; +} + +p.reference { + font-size: small; + padding-left: 1.5em; +}

1 0

[translation/tails-persistence-setup] https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup
by translation＠torproject.org 11 Nov '19

11 Nov '19

commit cc689625c3bb2986d42a43b42badc8f3526e15d9 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 11 11:49:39 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-s… --- nl/nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl/nl.po b/nl/nl.po index dd43a57cc..08adee1e4 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2019-10-21 09:06+0200\n" -"PO-Revision-Date: 2019-11-11 11:13+0000\n" +"PO-Revision-Date: 2019-11-11 11:23+0000\n" "Last-Translator: kwadronaut <kwadronaut(a)autistici.org>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-setup
by translation＠torproject.org 11 Nov '19

11 Nov '19

commit 62aeba194e42f0770bc4e31c404163cea2f042f0 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 11 11:19:37 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-persistence-s… --- nl/nl.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nl/nl.po b/nl/nl.po index 27b552f24..dd43a57cc 100644 --- a/nl/nl.po +++ b/nl/nl.po @@ -23,9 +23,9 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2019-10-07 08:43+0200\n" -"PO-Revision-Date: 2019-10-07 13:48+0000\n" -"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>\n" +"POT-Creation-Date: 2019-10-21 09:06+0200\n" +"PO-Revision-Date: 2019-11-11 11:13+0000\n" +"Last-Translator: kwadronaut <kwadronaut(a)autistici.org>\n" "Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[collector/master] Bump version to 1.13.1-dev.
by karsten＠torproject.org 11 Nov '19

11 Nov '19

commit d3d63bb1d8eaaf2c33486d68181fbb199041c9a5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Nov 11 10:19:39 2019 +0100 Bump version to 1.13.1-dev. --- CHANGELOG.md | 3 +++ build.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 174f2e1..5293207 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# Changes in version 1.1?.? - 2019-1?-?? + + # Changes in version 1.13.1 - 2019-11-11 * Minor changes diff --git a/build.xml b/build.xml index e91dae3..c75b69e 100644 --- a/build.xml +++ b/build.xml @@ -9,7 +9,7 @@ <property name="javadoc-title" value="CollecTor API Documentation"/> <property name="implementation-title" value="CollecTor" /> - <property name="release.version" value="1.13.1" /> + <property name="release.version" value="1.13.1-dev" /> <property name="project-main-class" value="org.torproject.metrics.collector.Main" /> <property name="name" value="collector"/> <property name="metricslibversion" value="2.9.1" />

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2019