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

[tor/release-0.4.1] Change loglevel of message 'Hash of session info was not as expected'
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit 05fa1689eb96a1249030e1d51828a308d19d728c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Sat Jul 20 18:28:07 2019 +0300 Change loglevel of message 'Hash of session info was not as expected' --- changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug12399 b/changes/bug12399 new file mode 100644 index 000000000..922c08c5e --- /dev/null +++ b/changes/bug12399 @@ -0,0 +1,3 @@ + o Minor bugfixes (logging): + - Change log level of message "Hash of session info was not as expected" + to LOG_PROTOCOL_WARN. Fixes bug 12399; bugfix on 0.1.1.10-alpha. diff --git a/src/feature/rend/rendmid.c b/src/feature/rend/rendmid.c index fcfa5052c..3ba48f885 100644 --- a/src/feature/rend/rendmid.c +++ b/src/feature/rend/rendmid.c @@ -70,7 +70,8 @@ rend_mid_establish_intro_legacy(or_circuit_t *circ, const uint8_t *request, goto err; } if (tor_memneq(expected_digest, request+2+asn1len, DIGEST_LEN)) { - log_warn(LD_PROTOCOL, "Hash of session info was not as expected."); + log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, + "Hash of session info was not as expected."); reason = END_CIRC_REASON_TORPROTOCOL; goto err; }

1 0

[tor/release-0.4.1] Merge branch 'maint-0.4.1' into release-0.4.1
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit d6f3e225194cce776d2c3dc51be61cbc7ade65fb Merge: 6bb876ccd e3a458e44 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 2 14:11:32 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug12399 | 3 +++ src/feature/rend/rendmid.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/master] ChangeLog/ReleaseNotes: fix a typo in the 0.4.1 changes entries
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit a3fad4d0575733bab2791e2c373c7cd69234ff9f Author: teor <teor(a)torproject.org> Date: Tue Aug 20 11:46:48 2019 +1000 ChangeLog/ReleaseNotes: fix a typo in the 0.4.1 changes entries Part of 31461. --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 219482fc6..cb91a7a96 100644 --- a/ChangeLog +++ b/ChangeLog @@ -306,7 +306,7 @@ Changes in version 0.4.1.1-alpha - 2019-05-22 circuits. This feature is only enabled when also supported by the circuit's middle node. (Clients may specify fixed middle nodes with the MiddleNodes option, and may force-disable this feature - with the CircuitPadding torrc.) Closes ticket 28634. + with the CircuitPadding option.) Closes ticket 28634. o Major features (code organization): - Tor now includes a generic publish-subscribe message-passing

1 0

[tor/master] ChangeLog/ReleaseNotes: fix some incorrect bugfix versions
by nickm＠torproject.org 02 Sep '19

02 Sep '19

commit f538e2398698d4aa05b65bba857260fed9126ef3 Author: teor <teor(a)torproject.org> Date: Tue Aug 20 11:48:07 2019 +1000 ChangeLog/ReleaseNotes: fix some incorrect bugfix versions Closes 31461. --- ChangeLog | 6 +++--- ReleaseNotes | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb91a7a96..439c435a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -490,7 +490,7 @@ Changes in version 0.4.1.1-alpha - 2019-05-22 o Minor bugfixes (directory authority, ipv6): - Directory authorities with IPv6 support now always mark themselves - as reachable via IPv6. Fixes bug 24338; bugfix on 0.4.0.2-alpha. + as reachable via IPv6. Fixes bug 24338; bugfix on 0.2.4.1-alpha. Patch by Neel Chauhan. o Minor bugfixes (documentation): @@ -528,7 +528,7 @@ Changes in version 0.4.1.1-alpha - 2019-05-22 Neel Chauhan. - When relaunching a circuit to a rendezvous service, mark the circuit as needing high-uptime routers as appropriate. Fixes bug - 17357; bugfix on 0.4.0.2-alpha. Patch by Neel Chauhan. + 17357; bugfix on 0.1.0.1-rc. Patch by Neel Chauhan. - Stop ignoring IPv6 link specifiers sent to v3 onion services. (IPv6 support for v3 onion services is still incomplete: see ticket 23493 for details.) Fixes bug 23588; bugfix on @@ -1462,7 +1462,7 @@ Changes in version 0.4.0.1-alpha - 2019-01-18 we had added up the sum of all nodes with a descriptor, but that could cause us to build failing circuits when we had either too many bridges or not enough guard nodes. Fixes bug 25885; bugfix on - 0.3.6.1-alpha. Patch by Neel Chauhan. + 0.2.3.1-alpha. Patch by Neel Chauhan. o Minor bugfixes (IPv6): - Fix tor_ersatz_socketpair on IPv6-only systems. Previously, the diff --git a/ReleaseNotes b/ReleaseNotes index b378fd07a..aa88c5321 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -911,7 +911,7 @@ Changes in version 0.4.0.5 - 2019-05-02 we had added up the sum of all nodes with a descriptor, but that could cause us to build failing circuits when we had either too many bridges or not enough guard nodes. Fixes bug 25885; bugfix on - 0.3.6.1-alpha. Patch by Neel Chauhan. + 0.2.3.1-alpha. Patch by Neel Chauhan. o Minor bugfixes (IPv6): - Fix tor_ersatz_socketpair on IPv6-only systems. Previously, the

1 0

[community/master] Add events
by hiro＠torproject.org 02 Sep '19

02 Sep '19

commit 9f4594d00a12d9d004b76f29bc0e19939da4432b Author: hiro <hiro(a)torproject.org> Date: Mon Sep 2 19:18:01 2019 +0200 Add events --- .gitignore | 2 +- lego | 2 +- templates/outreach.html | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 41a4e3a..9029559 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ public *.po contents+*.lr -.cache +.cache *.egg-info *.pyc diff --git a/lego b/lego index aa31aec..4e07d49 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit aa31aec9ca27d2037e7a3befb6a6e3aa1aed8f17 +Subproject commit 4e07d49bc08514376151c3a7c73dd3ed0b67583d diff --git a/templates/outreach.html b/templates/outreach.html index 18c697a..e35f896 100644 --- a/templates/outreach.html +++ b/templates/outreach.html @@ -34,5 +34,8 @@ </div> <div class="row py-5 text-center mx-auto"> <h2 class="display-4 text-primary text-center mx-auto">{{ _('Upcoming Tor Events') }}</h2> + <div class="col-12"> + {{ render_stream()|safe }} + </div> </div> </div>

1 0

[lego/master] Refactor plugin
by hiro＠torproject.org 02 Sep '19

02 Sep '19

commit 4e07d49bc08514376151c3a7c73dd3ed0b67583d Author: hiro <hiro(a)torproject.org> Date: Mon Sep 2 19:16:35 2019 +0200 Refactor plugin --- packages/xml-to-html/lektor_xml_to_html.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xml-to-html/lektor_xml_to_html.py b/packages/xml-to-html/lektor_xml_to_html.py index 61cd1fc..a98541d 100644 --- a/packages/xml-to-html/lektor_xml_to_html.py +++ b/packages/xml-to-html/lektor_xml_to_html.py @@ -26,7 +26,7 @@ class XmlToHtmlPlugin(Plugin): for entry in items: title = entry.findtext('title') link = entry.findtext('link') - stream += "<h3><a href=\"" + link +"\">" + title + "</a></h3>" + stream += "<div class=\"row\"><h3><a href=\"" + link +"\">" + title + "</a></h3></div>" return stream

1 0

[lego/master] Refactor plugin
by hiro＠torproject.org 02 Sep '19

02 Sep '19

commit 5fcae782132fbd810fcbb2a7db9ec222a62356f3 Author: hiro <hiro(a)torproject.org> Date: Mon Sep 2 19:13:21 2019 +0200 Refactor plugin --- packages/xml-to-html/lektor_xml_to_html.py | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/xml-to-html/lektor_xml_to_html.py b/packages/xml-to-html/lektor_xml_to_html.py index 1bebbf2..61cd1fc 100644 --- a/packages/xml-to-html/lektor_xml_to_html.py +++ b/packages/xml-to-html/lektor_xml_to_html.py @@ -22,7 +22,6 @@ class XmlToHtmlPlugin(Plugin): content = webFile.read() root = etree.fromstring(content) items = root.findall('channel/item') - file_object = open('../../../templates/stream.html', 'w') stream = "" for entry in items: title = entry.findtext('title')

1 0

[lego/master] Refactor plugin
by hiro＠torproject.org 02 Sep '19

02 Sep '19

commit 3f49f8263a9040e021dd2f82525158a7e696b1e9 Author: hiro <hiro(a)torproject.org> Date: Mon Sep 2 19:12:41 2019 +0200 Refactor plugin --- packages/xml-to-html/lektor_xml_to_html.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xml-to-html/lektor_xml_to_html.py b/packages/xml-to-html/lektor_xml_to_html.py index 03985a2..1bebbf2 100644 --- a/packages/xml-to-html/lektor_xml_to_html.py +++ b/packages/xml-to-html/lektor_xml_to_html.py @@ -31,4 +31,4 @@ class XmlToHtmlPlugin(Plugin): return stream - self.env.jinja_env.globals['render_strean'] = stream + self.env.jinja_env.globals['render_stream'] = stream

1 0

[lego/master] Refactor plugin
by hiro＠torproject.org 02 Sep '19

02 Sep '19

commit 802a851312bce5c29b269284e8bbcfe675f6b43a Author: hiro <hiro(a)torproject.org> Date: Mon Sep 2 19:11:38 2019 +0200 Refactor plugin --- packages/xml-to-html/lektor_xml_to_html.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xml-to-html/lektor_xml_to_html.py b/packages/xml-to-html/lektor_xml_to_html.py index 3bd0cdd..03985a2 100644 --- a/packages/xml-to-html/lektor_xml_to_html.py +++ b/packages/xml-to-html/lektor_xml_to_html.py @@ -10,7 +10,7 @@ from xml.etree import ElementTree as etree from urllib import request -class DisqusCommentsPlugin(Plugin): +class XmlToHtmlPlugin(Plugin): name = u'XML to HTML' description = u'Lektor plugin to add an XML feed as HTML.'

1 0

[lego/master] Refactor plugin
by hiro＠torproject.org 02 Sep '19

02 Sep '19

commit bd44d0fd56ade885c25d6e715238149c083798c9 Author: hiro <hiro(a)torproject.org> Date: Mon Sep 2 19:10:52 2019 +0200 Refactor plugin --- packages/xml-to-html/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/xml-to-html/setup.py b/packages/xml-to-html/setup.py index a68ade6..612e02a 100644 --- a/packages/xml-to-html/setup.py +++ b/packages/xml-to-html/setup.py @@ -10,7 +10,7 @@ setup( py_modules=['lektor_xml_to_html'], entry_points={ 'lektor.plugins': [ - 'xml-to-html = lektor_xml_to_html:XMLTOHTMLPlugin', + 'xml-to-html = lektor_xml_to_html:XmlToHtmlPlugin', ] } )

1 0