July 2017 - tor-commits - lists.torproject.org

[stem/master] Drop use of sys.maxint for descriptor creation
by atagar＠torproject.org 02 Jul '17

02 Jul '17

commit 16d6f4a584edb08c71da80baeccdc0f255cd8655 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 2 12:05:31 2017 -0700 Drop use of sys.maxint for descriptor creation Python 3.x drops sys.maxint... https://stackoverflow.com/questions/13795758/what-is-sys-maxint-in-python-3 As such descriptor creation broke our python3 compatibility... ====================================================================== ERROR: test_new_consensus_event ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/unit/response/events.py", line 1005, in test_new_consensus_event 's': 'Fast Named Running Stable Valid', File "/home/atagar/Desktop/stem/stem/descriptor/__init__.py", line 611, in create return cls(cls.content(attr, exclude, sign), validate = validate) File "/home/atagar/Desktop/stem/stem/descriptor/router_status_entry.py", line 625, in content ('r', '%s p1aag7VwarGxqctS7/fS0y5FU+s oQZFLYe9e4A7bOkWKR7TaNxb0JE %s %s 9001 0' % (_random_nickname(), _random_date(), _random_ipv4_address())), File "/home/atagar/Desktop/stem/stem/descriptor/__init__.py", line 1046, in _random_nickname return ('Unnamed%i' % random.randint(0, sys.maxint))[:20] AttributeError: 'module' object has no attribute 'maxint' No big whoop. We were just using it for 'gimme a big random number'. Fixing this revealed that we also had an off-by-one error with the string truncation. --- stem/descriptor/__init__.py | 3 +-- test/unit/descriptor/server_descriptor.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/stem/descriptor/__init__.py b/stem/descriptor/__init__.py index bf039f8..806e3e3 100644 --- a/stem/descriptor/__init__.py +++ b/stem/descriptor/__init__.py @@ -47,7 +47,6 @@ import os import random import re import string -import sys import tarfile import stem.prereq @@ -1043,7 +1042,7 @@ def _append_router_signature(content, private_key): def _random_nickname(): - return ('Unnamed%i' % random.randint(0, sys.maxint))[:20] + return ('Unnamed%i' % random.randint(0, 100000000000000))[:19] def _random_fingerprint(): diff --git a/test/unit/descriptor/server_descriptor.py b/test/unit/descriptor/server_descriptor.py index 4d36bd8..b31ad68 100644 --- a/test/unit/descriptor/server_descriptor.py +++ b/test/unit/descriptor/server_descriptor.py @@ -290,7 +290,7 @@ Qlx9HNCqCY877ztFRC624ja2ql6A2hBcuoYMbkHjcQ4= self.assertEqual(None, desc.version) self.assertEqual(None, desc.version_line) - self.assertEqual([(u'71.35.133.197', 9001, False), (u'12ab:2e19:3bcf::02:9970', 9001, True)], desc.or_addresses) + self.assertEqual([('71.35.133.197', 9001, False), ('12ab:2e19:3bcf::02:9970', 9001, True)], desc.or_addresses) self.assertEqual(None, desc.identifier_type) self.assertEqual(None, desc.identifier) self.assertEqual('4F0069BF91C04581B7C3CA9272E2D3228D4EA571', desc.digest)

1 0

[stem/master] Revising metrics-lib example
by atagar＠torproject.org 02 Jul '17

02 Jul '17

commit 26a82f1b15e50f0ee7ddeeb0c66ad9bbf99dec88 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 2 14:58:19 2017 -0700 Revising metrics-lib example Metrics-lib has been getting lots of improvements of late. Replacing our example with an updated one from Karsten. --- .../benchmark_server_descriptor_metrics_lib.java | 40 ++++++++++++---------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/docs/_static/example/benchmark_server_descriptor_metrics_lib.java b/docs/_static/example/benchmark_server_descriptor_metrics_lib.java index efb8634..72591c9 100644 --- a/docs/_static/example/benchmark_server_descriptor_metrics_lib.java +++ b/docs/_static/example/benchmark_server_descriptor_metrics_lib.java @@ -1,10 +1,15 @@ package org.torproject.descriptor; +import org.torproject.descriptor.Descriptor; +import org.torproject.descriptor.DescriptorReader; +import org.torproject.descriptor.DescriptorSourceFactory; +import org.torproject.descriptor.ServerDescriptor; + import java.io.File; import java.util.Iterator; -import org.torproject.descriptor.DescriptorSourceFactory; public class MeasurePerformance { + public static void main(String[] args) { measureAverageAdvertisedBandwidth(new File("server-descriptors-2015-11.tar")); } @@ -12,27 +17,24 @@ public class MeasurePerformance { private static void measureAverageAdvertisedBandwidth( File tarballFileOrDirectory) { System.out.println("Starting measureAverageAdvertisedBandwidth"); - long startedMillis = System.currentTimeMillis(); - long sumAdvertisedBandwidth = 0, countedServerDescriptors = 0; + final long startedMillis = System.currentTimeMillis(); + long sumAdvertisedBandwidth = 0; + long countedServerDescriptors = 0; DescriptorReader descriptorReader = DescriptorSourceFactory.createDescriptorReader(); - descriptorReader.addTarball(tarballFileOrDirectory); - descriptorReader.addDirectory(tarballFileOrDirectory); - Iterator<DescriptorFile> descriptorFiles = - descriptorReader.readDescriptors(); - while (descriptorFiles.hasNext()) { - DescriptorFile descriptorFile = descriptorFiles.next(); - for (Descriptor descriptor : descriptorFile.getDescriptors()) { - if (!(descriptor instanceof ServerDescriptor)) { - continue; - } - ServerDescriptor serverDescriptor = (ServerDescriptor) descriptor; - sumAdvertisedBandwidth += (long) Math.min(Math.min( - serverDescriptor.getBandwidthRate(), - serverDescriptor.getBandwidthBurst()), - serverDescriptor.getBandwidthObserved()); - countedServerDescriptors++; + Iterator<Descriptor> descriptors = + descriptorReader.readDescriptors(tarballFileOrDirectory).iterator(); + while (descriptors.hasNext()) { + Descriptor descriptor = descriptors.next(); + if (!(descriptor instanceof ServerDescriptor)) { + continue; } + ServerDescriptor serverDescriptor = (ServerDescriptor) descriptor; + sumAdvertisedBandwidth += (long) Math.min(Math.min( + serverDescriptor.getBandwidthRate(), + serverDescriptor.getBandwidthBurst()), + serverDescriptor.getBandwidthObserved()); + countedServerDescriptors++; } long endedMillis = System.currentTimeMillis(); System.out.println("Ending measureAverageAdvertisedBandwidth");

1 0

[sandboxed-tor-browser/master] Bug 22712: Suppress ATK Bridge initialization which will never work.
by yawning＠torproject.org 02 Jul '17

02 Jul '17

commit bbd4094157fa8858ca847954fddc63ae15fff815 Author: Yawning Angel <yawning(a)schwanenlied.me> Date: Sun Jul 2 11:50:57 2017 +0000 Bug 22712: Suppress ATK Bridge initialization which will never work. The Accessibility subsystem uses a subsystem via D-Bus to function, and will warn if said subsystem is inaccessible. As the host D-Bus is not, and likely will never be accesible from within the container, attempt to suppress the warnings. --- ChangeLog | 1 + src/cmd/sandboxed-tor-browser/internal/sandbox/application.go | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 69b4a5f..b42022a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ Changes in version 0.0.9 - UNRELEASED: + * Bug 22712: Suppress ATK Bridge initialization which will never work. * Fix the build being broken on Debian Jessie due to #22648. * Remove the undocumented command line options that enable unsafe behavior. diff --git a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go index f66c1ba..d3162dd 100644 --- a/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go +++ b/src/cmd/sandboxed-tor-browser/internal/sandbox/application.go @@ -770,6 +770,14 @@ func (h *hugbox) appendRestrictedGtk2(hasAdwaita bool) ([]string, string, error) h.setenv("GDK_PIXBUF_MODULE_FILE", "/dev/null") } + // Bug #22712 - Spurious AT-SPI warnings. + // + // The Accessibility subsystem uses a subsystem via D-Bus to function, + // and will warn if said subsystem is inaccessible. As the host D-Bus + // is not, and likely will never be accesible from within the container, + // attempt to suppress the warnings. + h.setenv("NO_AT_BRIDGE", "yes"); + return gtkLibs, gtkLibPath, nil }

1 0

[webwml/master] retire precise
by weasel＠torproject.org 02 Jul '17

02 Jul '17

commit 7740c60b52086b9249ddf72b583c8923c064996d Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 2 10:37:51 2017 +0200 retire precise --- docs/debian-selector.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/debian-selector.js b/docs/debian-selector.js index 71550a7..a6d4720 100644 --- a/docs/debian-selector.js +++ b/docs/debian-selector.js @@ -8,7 +8,6 @@ var software = { 'stretch': [ 'stretch' ], 'testing': [ 'testing' ], 'sid': [ 'sid' ], - 'precise': [ 'precise'], 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], 'yakkety': [ 'yakkety'], @@ -18,7 +17,6 @@ var software = { 'stretch': [ 'stretch' ], 'testing': [ 'testing' ], 'sid': [ 'sid' ], - 'precise': [ 'precise'], 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], 'yakkety': [ 'yakkety'], @@ -30,7 +28,6 @@ var software = { 'stretch': [ 'stretch' ], 'testing': [ 'testing' ], 'sid': [ 'sid' ], - 'precise': [ 'precise'], 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], 'yakkety': [ 'yakkety'], @@ -40,7 +37,6 @@ var software = { 'stretch': [ 'stretch' ], 'testing': [ 'testing' ], 'sid': [ 'sid' ], - 'precise': [ 'precise'], 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], 'yakkety': [ 'yakkety'],

1 0

[webwml/master] testing is called buster
by weasel＠torproject.org 02 Jul '17

02 Jul '17

commit 84a15a894fe3212323b7a1c662077988bbe2a466 Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 2 10:38:00 2017 +0200 testing is called buster --- docs/debian-selector.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/debian-selector.js b/docs/debian-selector.js index a6d4720..f4abbb3 100644 --- a/docs/debian-selector.js +++ b/docs/debian-selector.js @@ -5,8 +5,8 @@ var sources = {}; var software = { 'tor': { '_stable': { 'jessie': [ 'jessie' ], - 'stretch': [ 'stretch' ], - 'testing': [ 'testing' ], + 'stretch': [ 'stretch' ], + 'buster': [ 'buster' ], 'sid': [ 'sid' ], 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], @@ -15,7 +15,7 @@ var software = { 'experimental-0.3.0.x': { 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], - 'testing': [ 'testing' ], + 'buster': [ 'buster' ], 'sid': [ 'sid' ], 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], @@ -26,7 +26,7 @@ var software = { '_stable': { 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], - 'testing': [ 'testing' ], + 'buster': [ 'buster' ], 'sid': [ 'sid' ], 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], @@ -35,7 +35,7 @@ var software = { 'experimental-0.3.0.x': { 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], - 'testing': [ 'testing' ], + 'buster': [ 'buster' ], 'sid': [ 'sid' ], 'trusty': [ 'trusty'], 'xenial': [ 'xenial'],

1 0

[webwml/master] we also have zesty builds
by weasel＠torproject.org 02 Jul '17

02 Jul '17

commit aff22490a73849a10605d86f363e6365f33b09dc Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 2 10:38:46 2017 +0200 we also have zesty builds --- docs/debian-selector.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/debian-selector.js b/docs/debian-selector.js index 1f322dd..6c37670 100644 --- a/docs/debian-selector.js +++ b/docs/debian-selector.js @@ -11,6 +11,7 @@ var software = { 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], 'yakkety': [ 'yakkety'], + 'zesty': [ 'zesty'], }, 'experimental-0.3.1.x': { 'jessie': [ 'jessie' ], @@ -20,6 +21,7 @@ var software = { 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], 'yakkety': [ 'yakkety'], + 'zesty': [ 'zesty'], }, }, 'tor (from source)': { @@ -31,6 +33,7 @@ var software = { 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], 'yakkety': [ 'yakkety'], + 'zesty': [ 'zesty'], }, 'experimental-0.3.0.x': { 'jessie': [ 'jessie' ], @@ -40,6 +43,7 @@ var software = { 'trusty': [ 'trusty'], 'xenial': [ 'xenial'], 'yakkety': [ 'yakkety'], + 'zesty': [ 'zesty'], }, }, };

1 0

[webwml/master] experimental is 0.3.1.x
by weasel＠torproject.org 02 Jul '17

02 Jul '17

commit 2101309608b5c52ecceac33c7f73da4c591c3e4a Author: Peter Palfrader <peter(a)palfrader.org> Date: Sun Jul 2 10:38:12 2017 +0200 experimental is 0.3.1.x --- docs/debian-selector.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/debian-selector.js b/docs/debian-selector.js index f4abbb3..1f322dd 100644 --- a/docs/debian-selector.js +++ b/docs/debian-selector.js @@ -12,7 +12,7 @@ var software = { 'xenial': [ 'xenial'], 'yakkety': [ 'yakkety'], }, - 'experimental-0.3.0.x': { + 'experimental-0.3.1.x': { 'jessie': [ 'jessie' ], 'stretch': [ 'stretch' ], 'buster': [ 'buster' ],

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Jul '17

02 Jul '17

commit 515ff1e5e477caa5b2f40fd10c07829d8993d126 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 2 07:45:33 2017 +0000 Update translations for liveusb-creator --- vi/vi.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/vi/vi.po b/vi/vi.po index b79c4b3..549c6b1 100644 --- a/vi/vi.po +++ b/vi/vi.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-06-30 13:14+0200\n" -"PO-Revision-Date: 2017-07-02 07:01+0000\n" +"PO-Revision-Date: 2017-07-02 07:34+0000\n" "Last-Translator: Acooldude\n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n" @@ -481,19 +481,19 @@ msgstr "" #: ../tails_installer/utils.py:119 msgid "Could not open device for writing." -msgstr "" +msgstr "Đã không thể mở thiết bị cho việc ghi dữ liệu (writing)." #: ../data/tails-installer.ui.h:1 msgid "Use existing Live system ISO:" -msgstr "" +msgstr "Sử dụng [ảnh] ISO hệ thống trực tiếp (Live system) đang tồn tại:" #: ../data/tails-installer.ui.h:2 msgid "Select a distribution to download:" -msgstr "" +msgstr "Chọn một bản phân phối (distribution) để tải về:" #: ../data/tails-installer.ui.h:3 msgid "Target Device:" -msgstr "" +msgstr "Thiết bị Mục tiêu:" #: ../data/tails-installer.ui.h:4 msgid "Install Tails" @@ -504,7 +504,7 @@ msgid "" "To run Tails Installer you need an ISO image which can be downloaded from " "the Tails website: <a " "href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>" -msgstr "" +msgstr "Để chạy trình cài đặt Tails bạn cần một ảnh ISO được tải về từ trang web Tails: <a href=\"https://tails.boum.org/download/\">https://tails.boum.org/download/</a>" #: ../data/tails-installer-launcher.ui.h:2 msgid "Install" @@ -516,7 +516,7 @@ msgstr "• Cài đặt Tails lên một thẻ USB mới." #: ../data/tails-installer-launcher.ui.h:4 msgid "• The USB stick that you install on is formatted and all data is lost." -msgstr "" +msgstr "• Thẻ USB bạn cài đặt bị định dạng (format) và tất cả giữ liệu bị mất" #: ../data/tails-installer-launcher.ui.h:5 msgid "Upgrade"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 02 Jul '17

02 Jul '17

commit 5ce5d2a411ccbc5518da8d291e00e1bf8cb865e6 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Jul 2 07:15:30 2017 +0000 Update translations for liveusb-creator --- vi/vi.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vi/vi.po b/vi/vi.po index 174be5b..b79c4b3 100644 --- a/vi/vi.po +++ b/vi/vi.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-06-28 11:46+0200\n" -"PO-Revision-Date: 2017-06-29 09:24+0000\n" +"POT-Creation-Date: 2017-06-30 13:14+0200\n" +"PO-Revision-Date: 2017-07-02 07:01+0000\n" "Last-Translator: Acooldude\n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n" @@ -508,11 +508,11 @@ msgstr "" #: ../data/tails-installer-launcher.ui.h:2 msgid "Install" -msgstr "" +msgstr "Cài đặt" #: ../data/tails-installer-launcher.ui.h:3 msgid "• Install Tails on a new USB stick." -msgstr "" +msgstr "• Cài đặt Tails lên một thẻ USB mới." #: ../data/tails-installer-launcher.ui.h:4 msgid "• The USB stick that you install on is formatted and all data is lost." @@ -520,11 +520,11 @@ msgstr "" #: ../data/tails-installer-launcher.ui.h:5 msgid "Upgrade" -msgstr "" +msgstr "Nâng cấp" #: ../data/tails-installer-launcher.ui.h:6 msgid "• Upgrade a Tails USB stick to the version of an ISO image." -msgstr "" +msgstr "• Nâng cấp một thẻ USB Tails lên phiên bản của một ảnh ISO." #: ../data/tails-installer-launcher.ui.h:7 msgid ""

1 0

[tor/master] general formatting / whitespace / typo fixes
by arma＠torproject.org 01 Jul '17

01 Jul '17

commit 0fe7c42e0e8285b4b45e8dda4056f31f0c19fce2 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat Jul 1 17:56:06 2017 -0400 general formatting / whitespace / typo fixes --- ChangeLog | 6 +++--- ReleaseNotes | 6 +++--- src/or/channeltls.c | 1 - src/or/circuitbuild.c | 2 +- src/or/control.c | 2 +- src/or/dns.c | 2 +- src/or/entrynodes.c | 2 +- src/or/microdesc.c | 2 +- src/or/networkstatus.c | 4 ++-- src/or/routerparse.c | 4 ++-- 10 files changed, 15 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 38f2569..9f3dc46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2180,7 +2180,7 @@ Changes in version 0.3.0.1-alpha - 2016-12-19 subprotocol-versions mechanism, so that clients can tell which relays can identity themselves by Ed25519 ID. Closes ticket 20552. - o Minor features (fingerprinting resistence, authentication): + o Minor features (fingerprinting resistance, authentication): - Extend the length of RSA keys used for TLS link authentication to 2048 bits. (These weren't used for forward secrecy; for forward secrecy, we used P256.) Closes ticket 13752. @@ -5246,7 +5246,7 @@ Changes in version 0.2.6.8 - 2015-05-21 o Major bugfixes (hidden services, backport from 0.2.7.1-alpha): - Revert commit that made directory authorities assign the HSDir - flag to relay without a DirPort; this was bad because such relays + flag to relays without a DirPort; this was bad because such relays can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix on 0.2.6.3-alpha. @@ -5287,7 +5287,7 @@ Changes in version 0.2.7.1-alpha - 2015-05-12 o Major bugfixes (hidden services): - Revert commit that made directory authorities assign the HSDir - flag to relay without a DirPort; this was bad because such relays + flag to relays without a DirPort; this was bad because such relays can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix on 0.2.6.3-alpha. diff --git a/ReleaseNotes b/ReleaseNotes index 346e488..80c3e4c 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -592,7 +592,7 @@ Changes in version 0.3.0.6 - 2017-04-26 - Select 200 fallback directories for each release. Closes ticket 20881. - o Minor features (fingerprinting resistence, authentication): + o Minor features (fingerprinting resistance, authentication): - Extend the length of RSA keys used for TLS link authentication to 2048 bits. (These weren't used for forward secrecy; for forward secrecy, we used P256.) Closes ticket 13752. @@ -3239,7 +3239,7 @@ Changes in version 0.2.7.5 - 2015-11-20 o Major bugfixes (hidden services): - Revert commit that made directory authorities assign the HSDir - flag to relay without a DirPort; this was bad because such relays + flag to relays without a DirPort; this was bad because such relays can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix on 0.2.6.3-alpha. - When cannibalizing a circuit for an introduction point, always @@ -3854,7 +3854,7 @@ Changes in version 0.2.6.8 - 2015-05-21 o Major bugfixes (hidden services, backport from 0.2.7.1-alpha): - Revert commit that made directory authorities assign the HSDir - flag to relay without a DirPort; this was bad because such relays + flag to relays without a DirPort; this was bad because such relays can't handle BEGIN_DIR cells. Fixes bug 15850; bugfix on 0.2.6.3-alpha. diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 707dd5b..6547451 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -1915,7 +1915,6 @@ certs_cell_typenum_to_cert_type(int typenum) * of the connection, we then authenticate the server or mark the connection. * If it's the server side, wait for an AUTHENTICATE cell. */ - STATIC void channel_tls_process_certs_cell(var_cell_t *cell, channel_tls_t *chan) { diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 240c64b..833c0b9 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2581,7 +2581,7 @@ extend_info_from_node(const node_t *node, int for_direct_connect) ed_pubkey = node_get_ed25519_id(node); } else if (node_get_ed25519_id(node)) { log_info(LD_CIRC, "Not including the ed25519 ID for %s, since it won't " - " be able to authenticate it.", + "be able to authenticate it.", node_describe(node)); } diff --git a/src/or/control.c b/src/or/control.c index a953da9..4300dae 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -803,7 +803,7 @@ queued_events_flush_all(int force) } /** Libevent callback: Flushes pending events to controllers that are - * interested in them */ + * interested in them. */ static void flush_queued_events_cb(evutil_socket_t fd, short what, void *arg) { diff --git a/src/or/dns.c b/src/or/dns.c index 722c592..cc062e3 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1940,7 +1940,7 @@ dns_launch_wildcard_checks(void) launch_wildcard_check(8, 16, ipv6, ".com"); launch_wildcard_check(8, 16, ipv6, ".org"); launch_wildcard_check(8, 16, ipv6, ".net"); - } + } } } diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index fa768fc..739ec82 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -813,7 +813,7 @@ STATIC entry_guard_t * entry_guard_add_to_sample(guard_selection_t *gs, const node_t *node) { - log_info(LD_GUARD, "Adding %s as to the entry guard sample set.", + log_info(LD_GUARD, "Adding %s to the entry guard sample set.", node_describe(node)); /* make sure that the guard is not already sampled. */ diff --git a/src/or/microdesc.c b/src/or/microdesc.c index a4e6b40..18a6fbd 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -876,7 +876,7 @@ update_microdesc_downloads(time_t now) smartlist_free(missing); } -/** For every microdescriptor listed in the current microdecriptor consensus, +/** For every microdescriptor listed in the current microdescriptor consensus, * update its last_listed field to be at least as recent as the publication * time of the current microdescriptor consensus. */ diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index fffd107..a9a6227 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -76,7 +76,7 @@ static strmap_t *unnamed_server_map = NULL; * status. */ STATIC networkstatus_t *current_ns_consensus = NULL; -/** Most recently received and validated v3 "microdec"-flavored consensus +/** Most recently received and validated v3 "microdesc"-flavored consensus * network status. */ STATIC networkstatus_t *current_md_consensus = NULL; @@ -1783,7 +1783,7 @@ networkstatus_set_current_consensus(const char *consensus, if (from_cache && !was_waiting_for_certs) { /* We previously stored this; check _now_ to make sure that version-kills - * really work. This happens even before we check signatures: we did so + * really work. This happens even before we check signatures: we did so * before when we stored this to disk. This does mean an attacker who can * write to the datadir can make us not start: such an attacker could * already harm us by replacing our guards, which would be worse. */ diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 0f6113c..6a03194 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -3360,8 +3360,8 @@ extract_shared_random_srvs(networkstatus_t *ns, smartlist_t *tokens) voter_identity = "consensus"; } - /* We extract both and on error, everything is stopped because it means - * the votes is malformed for the shared random value(s). */ + /* We extract both, and on error everything is stopped because it means + * the vote is malformed for the shared random value(s). */ if (extract_one_srv(tokens, K_PREVIOUS_SRV, &ns->sr_info.previous_srv) < 0) { log_warn(LD_DIR, "SR: Unable to parse previous SRV from %s", voter_identity);

1 0