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

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 19 Oct '18

19 Oct '18

commit 1068a95673530f64304e3ed0d7e7820c54301a4a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 19 22:15:38 2018 +0000 Update translations for https_everywhere --- pt_BR/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/https-everywhere.dtd b/pt_BR/https-everywhere.dtd index 81f6d29e2..898b78db5 100644 --- a/pt_BR/https-everywhere.dtd +++ b/pt_BR/https-everywhere.dtd @@ -18,7 +18,7 @@ <!ENTITY https-everywhere.options.enableMixedRulesets "Habilitar conjuntos de regras de conteúdo misto"> <!ENTITY https-everywhere.options.showDevtoolsTab "Exibir a aba das ferramentas de desenvolvimento"> <!ENTITY https-everywhere.options.autoUpdateRulesets "Atualizar automaticamente os conjuntos de regras"> -<!ENTITY https-everywhere.options.userRulesListed "HTTPS Everywhere User Rules"> +<!ENTITY https-everywhere.options.userRulesListed "Regras de usuários do HTTPS Everywhere"> <!ENTITY https-everywhere.options.disabledUrlsListed "HTTPS Everywhere Sites Desabilitados"> <!ENTITY https-everywhere.options.updateChannelsWarning "Alerta: Adicionando atualização de canais pode motivar atacantes a sequestrar seu navegador. Somente edite essa seção se você souber o que você está fazendo!"> <!ENTITY https-everywhere.options.addUpdateChannel "Adicione canal de atualização">

1 0

[nyx/master] Renaming our process could potentially crash nyx
by atagar＠torproject.org 19 Oct '18

19 Oct '18

commit d3dd23cec8cab7eea4969d0c462a2e1abfa5b19d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 19 12:50:03 2018 -0700 Renaming our process could potentially crash nyx Stem's set_process_name() raises IOErrors when unable to change the name of our process. In practice this has been moot because it only arises when lengthening our process name, and nyx always shortens it. But in one instance seems that wasn't the case... https://trac.torproject.org/projects/tor/ticket/27556 Not entirely clear why, but regardless we should definitely catch this if it arises. --- nyx/starter.py | 7 ++++++- web/changelog/index.html | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nyx/starter.py b/nyx/starter.py index ab2c25c..60a9ba0 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -219,7 +219,12 @@ def _set_process_name(): "nyx <input args>". """ - stem.util.system.set_process_name('nyx\0%s' % '\0'.join(sys.argv[1:])) + process_name = 'nyx\0%s' % '\0'.join(sys.argv[1:]) + + try: + stem.util.system.set_process_name(process_name) + except IOError as exc: + stem.util.log.info("Unable to rename our process from '%s' to '%s' (%s)." % (stem.util.system.get_process_name(), process_name.replace('\0', ' '), exc)) def _shutdown_daemons(controller): diff --git a/web/changelog/index.html b/web/changelog/index.html index 11a2332..abd1483 100644 --- a/web/changelog/index.html +++ b/web/changelog/index.html @@ -73,6 +73,7 @@ <li>Connect by default to Tor Browser's default port (9151) when it's available</li> <li>Nyxrc <b>color_override</b> configuration values only worked if camel case (<a href="https://trac.torproject.org/projects/tor/ticket/26026">ticket</a>)</li> <li>'<b>sqlite3.OperationalError</b>' crash when ran with multiple users that share a home directory (<a href="https://trac.torproject.org/projects/tor/ticket/27938">ticket</a>)</li> + <li>Process renaming could potentially crash (<a href="https://trac.torproject.org/projects/tor/ticket/27556">ticket</a>)</li> <li>Blank debug path caused us to crash (<a href="https://trac.torproject.org/projects/tor/ticket/27350">ticket</a>)</li> </ul> </li>

1 0

[nyx/master] Require Stem 1.7
by atagar＠torproject.org 19 Oct '18

19 Oct '18

commit 231ca0079cb412ff8702519cebd2548b5bd6f88e Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 19 11:55:16 2018 -0700 Require Stem 1.7 We don't yet use any features exclusive to Stem 1.7 but that could change any time. Our next Nyx release should only be used with the latest Stem release (otherwise troubleshooting user issues will truly be a pita). --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7eedb28..2ca331c 100644 --- a/setup.py +++ b/setup.py @@ -79,7 +79,7 @@ try: url = ATTR['url'], packages = ['nyx', 'nyx.panel'], keywords = 'tor onion controller', - install_requires = ['stem>=1.6.0'], + install_requires = ['stem>=1.7.0'], package_data = {'nyx': ['settings/*']}, entry_points = {'console_scripts': ['nyx = nyx.__init__:main']}, classifiers = [

1 0

[nyx/master] Add missing changelog entries
by atagar＠torproject.org 19 Oct '18

19 Oct '18

commit a20a8fdccee1c4f331b21d5ff018939a5a3c4241 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 19 11:54:33 2018 -0700 Add missing changelog entries Skimmed over our git history to fill in entries I earlier forgot. --- web/changelog/index.html | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/web/changelog/index.html b/web/changelog/index.html index a188ae5..11a2332 100644 --- a/web/changelog/index.html +++ b/web/changelog/index.html @@ -72,7 +72,7 @@ <ul> <li>Connect by default to Tor Browser's default port (9151) when it's available</li> <li>Nyxrc <b>color_override</b> configuration values only worked if camel case (<a href="https://trac.torproject.org/projects/tor/ticket/26026">ticket</a>)</li> - <li>Crashed with a 'sqlite3.OperationalError' if ran with different users that share a home directory (<a href="https://trac.torproject.org/projects/tor/ticket/27938">ticket</a>)</li> + <li>'<b>sqlite3.OperationalError</b>' crash when ran with multiple users that share a home directory (<a href="https://trac.torproject.org/projects/tor/ticket/27938">ticket</a>)</li> <li>Blank debug path caused us to crash (<a href="https://trac.torproject.org/projects/tor/ticket/27350">ticket</a>)</li> </ul> </li> @@ -83,6 +83,12 @@ </ul> </li> + <li><span class="component">Graph</span> + <ul> + <li>Removed confusing, unit-less 'measured' statistic</li> + </ul> + </li> + <li><span class="component">Connections</span> <ul> <li>Geoip information unavailable for inbound connections</li> @@ -90,6 +96,12 @@ </ul> </li> + <li><span class="component">Logging</span> + <ul> + <li>Python3 crashed when dates are on year boundaries (<a href="https://trac.torproject.org/projects/tor/ticket/24820">ticket</a>)</li> + </ul> + </li> + <li><span class="component">Configuration Editor</span> <ul> <li>New tor configuration options crashed nyx when shown (<b><a href="https://trac.torproject.org/projects/tor/ticket/24401">ticket</a></b>)</li> @@ -102,6 +114,13 @@ <li>Resizing could crash the interface (<b><a href="https://trac.torproject.org/projects/tor/ticket/24382">ticket</a></b>)</li> </ul> </li> + + <li><span class="component">Website</span> + <ul> + <li>Greatly expanded platforms available on the <a href="../index.html#download">download page</a></li> + <li>Added '<a href="../index.html#getting_started">How do I get started?</a>' section to the FAQ</li> + </ul> + </li> </ul> <div id="version-2-0" class="section"></div>

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/396'
by nickm＠torproject.org 19 Oct '18

19 Oct '18

commit 275e831ceac6382aafb1186976a3edfadcd0c87e Merge: 95c3cc2b9 b0c41e3ec Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 19 14:29:01 2018 -0400 Merge remote-tracking branch 'tor-github/pr/396' src/config/mmdb-convert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/master] Fix the missing unpack function in mmdb-convert.py
by nickm＠torproject.org 19 Oct '18

19 Oct '18

commit b0c41e3ec2bca832466ea7709827518159af0c08 Author: Jay Bitron <jaybitron(a)gmail.com> Date: Wed Oct 10 14:12:53 2018 -0700 Fix the missing unpack function in mmdb-convert.py --- src/config/mmdb-convert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/config/mmdb-convert.py b/src/config/mmdb-convert.py index 3a454a3fc..706a8b03c 100644 --- a/src/config/mmdb-convert.py +++ b/src/config/mmdb-convert.py @@ -77,7 +77,7 @@ def to_int32(s): def to_int28(s): "Parse a pair of big-endian 28-bit integers from bytestring s." - a, b = unpack("!LL", s + b'\x00') + a, b = struct.unpack("!LL", s + b'\x00') return (((a & 0xf0) << 20) + (a >> 8)), ((a & 0x0f) << 24) + (b >> 8) class Tree(object):

1 0

[webwml/master] Add Maggie to the people page
by atagar＠torproject.org 19 Oct '18

19 Oct '18

commit 1e5f4f529ead34a1e3f5a30eae2770995cc68de2 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 19 11:22:58 2018 -0700 Add Maggie to the people page --- about/en/corepeople.wml | 96 ++++++++++++++++++++++++++-------------------- images/people/wayward.png | Bin 0 -> 4598 bytes 2 files changed, 54 insertions(+), 42 deletions(-) diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml index 0e6e1b9c..a9b415c8 100644 --- a/about/en/corepeople.wml +++ b/about/en/corepeople.wml @@ -508,6 +508,18 @@ </td> <td> + <a id="wayward"></a> + <div class="photo"><img src="$(IMGROOT)/people/wayward.png" alt="wayward" /></div> + <div class="icon"><a href="https://twitter.com/meochaidha"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> + <div class="name"><a href="#wayward">Maggie Haughey</a></div> + <div class="field"><b>IRC:</b> wayward</div> + <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> + <div class="description">Community team, user advocate, and Mozilla fellow.</div> + </td> + </tr> + + <tr> + <td> <a id="agrabeli"></a> <div class="photo"><img src="$(IMGROOT)/people/agrabeli.png" alt="agrabeli" /></div> <div class="icon"><a href="https://twitter.com/agrabeli_"><img src="$(IMGROOT)/twitter-small.png" alt="twitter" /></a></div> @@ -517,9 +529,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Maria manages OONI's Partnership Program and writes research reports on internet censorship around the world.</div> </td> - </tr> - <tr> <td> <a id="mcs"></a> <div class="photo"><img src="$(IMGROOT)/people/mcs.png" alt="mcs" /></div> @@ -529,7 +539,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Developer on the Tor Browser team.</div> </td> + </tr> + <tr> <td> <a id="matt"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -537,9 +549,7 @@ <div class="name"><a href="#matt">Matt Blaze</a></div> <div class="description">Chairs the Tor Board of Directors. Professor at the University of Pennsylvania where he researches security, privacy, and anonymity.</div> </td> - </tr> - <tr> <td> <a id="pastly"></a> <div class="photo"><img src="$(IMGROOT)/people/pastly.png" alt="pastly" /></div> @@ -548,7 +558,9 @@ <div class="field"><b>IRC:</b> pastly</div> <div class="description">Matt <a href="http://mattttttssi4lhud.onion/">implemented</a> the <a href="http://www.robgjansen.com/publications/kist-sec2014.pdf">KIST scheduler</a> into Tor. He helps safely measure Tor and says helpful things on IRC.</div> </td> + </tr> + <tr> <td> <a id="sysrqb"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -558,9 +570,7 @@ <div class="field"><b>IRC:</b> sysrqb</div> <div class="description">Worked on tor, torsocks, and many other projects. Helped maintain and develop BridgeDB.</div> </td> - </tr> - <tr> <td> <a id="meejah"></a> <div class="photo"><img src="$(IMGROOT)/people/meejah.png" alt="meejah" /></div> @@ -570,7 +580,9 @@ <div class="field"><b>IRC:</b> meejah</div> <div class="description"><a href="https://meejah.ca">Author</a> of <a href="https://github.com/meejah/txtorcon">txtorcon</a>, <a href="https://github.com/meejah/carml">carml</a> and other Tor Python tools including some for bad-relay hunting.</div> </td> + </tr> + <tr> <td> <a id="micahflee"></a> <div class="photo"><img src="$(IMGROOT)/people/micahflee.png" alt="micahflee" /></div> @@ -579,9 +591,7 @@ <div class="name"><a href="#micahflee">Micah Lee</a></div> <div class="description">Developer of <a href="https://github.com/micahflee/onionshare">OnionShare</a> and <a href="https://github.com/micahflee/torbrowser-launcher">Tor Browser Launcher</a> journalist and security engineer at <a href="https://theintercept.com/staff/micah-lee/">The Intercept</a> and advocate for <a href="https://freedom.press/">freedom of the press</a>.</div> </td> - </tr> - <tr> <td> <a id="mtigas"></a> <div class="photo"><img src="$(IMGROOT)/people/mtigas.png" alt="mtigas" /></div> @@ -591,7 +601,9 @@ <div class="field"><b>IRC:</b> mtigas</div> <div class="description">Works on <a href="https://mike.tig.as/onionbrowser/">Onion Browser</a>, iOS, and hacker-journalist at <a href="https://www.propublica.org/">ProPublica</a> running their <a href="https://www.propub3r6espa33w.onion/">onion service</a>.</div> </td> + </tr> + <tr> <td> <a id="moritz"></a> <div class="photo"><img src="$(IMGROOT)/people/moritz.png" alt="moritz" /></div> @@ -600,9 +612,7 @@ <div class="name"><a href="#moritz">Moritz Bartl</a></div> <div class="description">Co-founder of <a href="https://www.torservers.net/">torservers.net</a>, a network of non-profit organizations that run Tor exit relays.</div> </td> - </tr> - <tr> <td> <a id="n8fr8"></a> <div class="photo"><img src="$(IMGROOT)/people/n8fr8.png" alt="n8fr8" /></div> @@ -611,7 +621,9 @@ <div class="field"><b>IRC:</b> n8fr8</div> <div class="description">Founder of the <a href="https://guardianproject.info/">Guardian Project</a>. Orbot lead developer and contributor to Orfox, Onion Browser and NetCipher SDK. Director of Technology at Tibet Action Institute.</div> </td> + </tr> + <tr> <td> <a id="nickhopper"></a> <div class="photo"><img src="$(IMGROOT)/people/nickhopper.png" alt="nickhopper" /></div> @@ -620,9 +632,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href="https://www-users.cs.umn.edu/~hopper/">Researcher</a> interested in improving Tor's performance and resistance to traffic analysis. Some of my work is described <a href="https://www-users.cs.umn.edu/~hopper/research.html">here</a>.</div> </td> - </tr> - <tr> <td> <a id="nickm"></a> <div class="photo"><img src="$(IMGROOT)/people/nickm.png" alt="nickm" /></div> @@ -633,7 +643,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">One of the three original designers of Tor - does a lot of the ongoing design work, and coordinates and leads ongoing development.</div> </td> + </tr> + <tr> <td> <a id="boklm"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -643,9 +655,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Works on Tor Browser.</div> </td> - </tr> - <tr> <td> <a id="mrphs"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -655,7 +665,9 @@ <div class="field"><b>IRC:</b> mrphs</div> <div class="description">His main area of interests are End-users Accessibility/Security, UX, Censorship, Advocacy and Onion Services.</div> </td> + </tr> + <tr> <td> <a id="pari"></a> <div class="photo"><img src="$(IMGROOT)/people/pari.png" alt="pari" /></div> @@ -665,9 +677,7 @@ <div class="field"><b>IRC:</b> pari</div> <div class="description">Works with UX and Community teams, and on Tor India initiatives. Started as an Outreachy intern.</div> </td> - </tr> - <tr> <td> <a id="syverson"></a> <div class="photo"><img src="$(IMGROOT)/people/syverson.png" alt="syverson" /></div> @@ -675,7 +685,9 @@ <div class="field"><b>IRC:</b> syverson</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> researcher on most things Tor. Inventor of <a href="https://www.onion-router.net/">onion routing</a>, and one of the three original designers of Tor.</div> </td> + </tr> + <tr> <td> <a id="pepijn"></a> <div class="photo"><img src="$(IMGROOT)/people/pepijn.png" alt="pepijn" /></div> @@ -684,16 +696,16 @@ <div class="name"><a href="#pepijn">Pepijn Le Heux</a></div> <div class="description">Lawyer based in The Netherlands and co-founder of Hart voor Internetvrijheid.</div> </td> - </tr> - <tr> <td> <a id="peter"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> <div class="name"><a href="#peter">Peter Palfrader</a></div> <div class="description">Manages the Debian packages, runs one of the directory authorities, and generally helps out a lot.</div> </td> + </tr> + <tr> <td> <a id="phw"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -703,9 +715,7 @@ <div class="field"><b>IRC:</b> phw</div> <div class="description">Maintains <a href="https://gitweb.torproject.org/user/phw/exitmap.git/">exitmap</a> and <a href="https://gitweb.torproject.org/user/phw/sybilhunter.git/">sybilhunter</a>, works on <a href="https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRelays">bad relay detection</a>, and does <a href="https://nymity.ch/papers.html">security and privacy research</a>.</div> </td> - </tr> - <tr> <td> <a id="pili"></a> <div class="photo"><img src="$(IMGROOT)/people/pili.png" alt="pili" /></div> @@ -716,7 +726,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Project Manager for the Tor Browser, Community and UX teams.</div> </td> + </tr> + <tr> <td> <a id="robt"></a> <div class="photo"><img src="$(IMGROOT)/people/robt.png" alt="robt" /></div> @@ -724,9 +736,7 @@ <div class="name"><a href="#robt">Rabbi Rob Thomas</a></div> <div class="description">CEO of Team Cymru, which supports Tor through hosting, research, and infosec assistance.</div> </td> - </tr> - <tr> <td> <a id="ramy"></a> <div class="photo"><img src="$(IMGROOT)/people/ramy.png" alt="ramy" /></div> @@ -735,7 +745,9 @@ <div class="name"><a href="#ramy">Ramy Raoof</a></div> <div class="description">Tor Board member, technologist, and privacy and security researcher.</div> </td> + </tr> + <tr> <td> <a id="pospeselr"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -745,9 +757,7 @@ <div class="field"><b>IRC:</b> pospeselr</div> <div class="description">Tor Browser developer.</div> </td> - </tr> - <tr> <td> <a id="robgjansen"></a> <div class="photo"><img src="$(IMGROOT)/people/robgjansen.png" alt="robgjansen" /></div> @@ -757,7 +767,9 @@ <div class="field"><b>IRC:</b> robgjansen</div> <div class="description"><a href="https://www.nrl.navy.mil">NRL</a> research scientist, <a href="http://www.robgjansen.com/">leading expert in Tor network performance</a>, and author of <a href="https://shadow.github.io/">Shadow</a>.</div> </td> + </tr> + <tr> <td> <a id="arma"></a> <div class="photo"><img src="$(IMGROOT)/people/arma.png" alt="arma" /></div> @@ -767,9 +779,7 @@ <div class="field"><b>IRC:</b> arma</div> <div class="description">Original developer of Tor along with Nick and Paul. Leading privacy researcher, coordinating developers and researchers.</div> </td> - </tr> - <tr> <td> <a id="sajolida"></a> <div class="photo"><img src="$(IMGROOT)/people/sajolida.png" alt="sajolida" /></div> @@ -778,7 +788,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Technical writing, UX, and fundraising for Tails.</div> </td> + </tr> + <tr> <td> <a id="sstevenson"></a> <div class="photo"><img src="$(IMGROOT)/people/sstevenson.png" alt="sstevenson" /></div> @@ -786,9 +798,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Directs and coordinates all fundraising activities.</div> </td> - </tr> - <tr> <td> <a id="sebastian"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -796,7 +806,9 @@ <div class="name"><a href="#sebastian">Sebastian Hahn</a></div> <div class="description">Helps people around the world use and understand Tor better. Generally helps everything run smoothly. Runs one of the directory authorities.</div> </td> + </tr> + <tr> <td> <a id="sisbell"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -806,9 +818,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Works on Tor Browser for Android.</div> </td> - </tr> - <tr> <td> <a id="ssteele"></a> <div class="photo"><img src="$(IMGROOT)/people/ssteele.png" alt="ssteele" /></div> @@ -819,7 +829,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Executive Director of the Tor Project, Inc.</div> </td> + </tr> + <tr> <td> <a id="hiro"></a> <div class="photo"><img src="$(IMGROOT)/people/hiro.png" alt="hiro" /></div> @@ -829,9 +841,7 @@ <div class="field"><b>IRC:</b> hiro</div> <div class="description">Hiro builds and runs Tor Project's web applications and services.</div> </td> - </tr> - <tr> <td> <a id="inf0"></a> <div class="photo"><img src="$(IMGROOT)/people/inf0.png" alt="inf0" /></div> @@ -841,7 +851,9 @@ <div class="field"><b>IRC:</b> inf0</div> <div class="description">Directory authority operator, outreach and trains human rights activists. System's Engineer at Team Cymru and co-Founder of accessnow.org.</div> </td> + </tr> + <tr> <td> <a id="stephw"></a> <div class="photo"><img src="$(IMGROOT)/people/stephw.png" alt="stephw" /></div> @@ -852,9 +864,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description">Directs communications.</div> </td> - </tr> - <tr> <td> <a id="sjmurdoch"></a> <div class="photo"><img src="$(IMGROOT)/people/sjmurdoch.png" alt="sjmurdoch" /></div> @@ -864,7 +874,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description"><a href=""http://murdoch.is/"">Principal Research Fellow</a> at University College London. He is the original creator of the <a href=""https://www.torproject.org/projects/torbrowser.html.en"">Tor Browser</a>.</div> </td> + </tr> + <tr> <td> <a id="sukhe"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -873,9 +885,7 @@ <div class="field"><b>IRC:</b> sukhe</div> <div class="description"><a href="https://trac.torproject.org/projects/tor/wiki/torbirdy">TorBirdy</a> and <a href="https://trac.torproject.org/projects/tor/wiki/doc/TorMessenger">Tor Messenger</a> developer. Member of the <a href="https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam">Community Team</a>.</div> </td> - </tr> - <tr> <td> <a id="haxxpop"></a> <div class="photo"><img src="$(IMGROOT)/people/haxxpop.png" alt="haxxpop" /></div> @@ -885,7 +895,9 @@ <div class="field"><b>IRC:</b> haxxpop</div> <div class="description">Contributes to core Tor and especially onion services.</div> </td> + </tr> + <tr> <td> <a id="catalyst"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -896,9 +908,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div> <div class="description">Software archaeologist and keeper of C language arcana. Works with applied cryptography, protocol design, software security, and technical debt restructuring.</div> </td> - </tr> - <tr> <td> <a id="teor"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> @@ -908,7 +918,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/they/them">they</a></div> <div class="description">Tor developer and chutney maintainer. Currently working on onion services, directory documents, and statistics.</div> </td> + </tr> + <tr> <td> <a id="tjr"></a> <div class="photo"><img src="$(IMGROOT)/people/tjr.png" alt="tjr" /></div> @@ -919,9 +931,7 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/he">he</a></div> <div class="description">Maintains <a href="https://consensus-health.torproject.org/">Consensus Health </a>, runs one of the bandwidth authorities, and contributes to Tor Browser.</div> </td> - </tr> - <tr> <td> <a id="t0mmy"></a> <div class="photo"><img src="$(IMGROOT)/people/t0mmy.png" alt="t0mmy" /></div> @@ -931,7 +941,9 @@ <div class="field"><b>IRC:</b> t0mmy</div> <div class="description">Writes and edits grant proposals, one-pagers, blogposts, etc.</div> </td> + </tr> + <tr> <td> <a id="egypcio"></a> <div class="photo"><img src="$(IMGROOT)/people/egypcio.png" alt="egypcio" /></div> @@ -941,9 +953,7 @@ <div class="field"><b>IRC:</b> egypcio</div> <div class="description">TorBSD Diversity Project (TDP); IPv6 Enthusiast, BSD Systems Evangelist, and Bridges/Relays Operator.</div> </td> - </tr> - <tr> <td> <a id="wseltzer"></a> <div class="photo"><img src="$(IMGROOT)/people/wseltzer.png" alt="wseltzer" /></div> @@ -954,7 +964,9 @@ <div class="field"><b>Pronoun:</b> <a href="http://pronoun.is/she">she</a></div> <div class="description"><a href="https://wendy.seltzer.org/">Techie lawyer</a> and former Tor board member. She works on legal and policy support for private and secure communications.</div> </td> + </tr> + <tr> <td> <a id="yawning"></a> <div class="photo"><img src="$(IMGROOT)/people/no_photo.png" alt="no photo" /></div> diff --git a/images/people/wayward.png b/images/people/wayward.png new file mode 100644 index 00000000..1ccffe7d Binary files /dev/null and b/images/people/wayward.png differ

1 0

[tor/maint-0.3.5] rust/protover: reject extra commas
by nickm＠torproject.org 19 Oct '18

19 Oct '18

commit 1ed5e009cb09b1e0b348f6c8420a0d4dae746ec9 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Sat Aug 18 13:41:19 2018 +0000 rust/protover: reject extra commas The C implementation had gotten this wrong too, in a slightly different way. Introduced in 5af03c1ef3c4718b79abb1638f5a8c275129530a. Fixes #27197; bugfix on 0.3.3.3-alpha. --- changes/bug27197 | 3 +++ src/rust/protover/protoset.rs | 27 ++++++++++++++++----------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/changes/bug27197 b/changes/bug27197 new file mode 100644 index 000000000..e389f8506 --- /dev/null +++ b/changes/bug27197 @@ -0,0 +1,3 @@ + o Minor bugfixes (protover, rust): + - Reject extra commas in version string. Fixes bug 27197; bugfix on + 0.3.3.3-alpha. diff --git a/src/rust/protover/protoset.rs b/src/rust/protover/protoset.rs index b99e1a99f..7576324c9 100644 --- a/src/rust/protover/protoset.rs +++ b/src/rust/protover/protoset.rs @@ -329,23 +329,25 @@ impl FromStr for ProtoSet { /// assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("3-")); /// assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1-,4")); /// - /// // Things which would get parsed into an _empty_ `ProtoSet` are, - /// // however, legal, and result in an empty `ProtoSet`: + /// // An empty string is, however, legal, and results in an + /// // empty `ProtoSet`: /// assert_eq!(Ok(ProtoSet::default()), ProtoSet::from_str("")); - /// assert_eq!(Ok(ProtoSet::default()), ProtoSet::from_str(",,,")); /// # /// # Ok(protoset) /// # } /// # fn main() { do_test(); } // wrap the test so we can use the ? operator /// ``` fn from_str(version_string: &str) -> Result<Self, Self::Err> { + // If we were passed in an empty string, then return an empty ProtoSet. + if version_string.is_empty() { + return Ok(Self::default()); + } + let mut pairs: Vec<(Version, Version)> = Vec::new(); let pieces: ::std::str::Split<char> = version_string.split(','); for p in pieces { - if p.is_empty() { - continue; - } else if p.contains('-') { + if p.contains('-') { let mut pair = p.splitn(2, '-'); let low = pair.next().ok_or(ProtoverError::Unparseable)?; @@ -367,11 +369,7 @@ impl FromStr for ProtoSet { pairs.push((v, v)); } } - // If we were passed in an empty string, or - // simply a comma, or a pile of commas, then return an empty ProtoSet. - if pairs.len() == 0 { - return Ok(ProtoSet::default()); - } + ProtoSet::from_slice(&pairs[..]) } } @@ -536,6 +534,13 @@ mod test { } #[test] + fn test_versions_from_str_commas() { + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str(",")); + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1,,2")); + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1,2,")); + } + + #[test] fn test_versions_from_str_hyphens() { assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("--1")); assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("-1-2"));

1 0

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

19 Oct '18

commit 95c3cc2b904f6bf7e5d381193b9e59ec32a2713c Merge: a05a11306 1ae911660 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 19 14:21:01 2018 -0400 Merge branch 'maint-0.3.5'

1 0

[tor/master] Merge remote-tracking branch 'onionk/rust-protocommas1' into maint-0.3.5
by nickm＠torproject.org 19 Oct '18

19 Oct '18

commit 1ae91166016ec70a242c6dbb14c9ca5e77b1313f Merge: a5599fb71 b91bc1bab Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 19 14:20:57 2018 -0400 Merge remote-tracking branch 'onionk/rust-protocommas1' into maint-0.3.5 changes/bug27197 | 3 +++ src/rust/protover/protoset.rs | 33 ++++++++++++++++----------------- 2 files changed, 19 insertions(+), 17 deletions(-) diff --cc src/rust/protover/protoset.rs index 3bfa7815f,4f603a33c..aa8d243ba --- a/src/rust/protover/protoset.rs +++ b/src/rust/protover/protoset.rs @@@ -366,20 -347,15 +370,15 @@@ impl FromStr for ProtoSet let pieces: ::std::str::Split<char> = version_string.split(','); for p in pieces { - if p.is_empty() { - continue; - } else if p.contains('-') { + if p.contains('-') { let mut pair = p.splitn(2, '-'); - let low = pair.next().ok_or(ProtoverError::Unparseable)?; + let low = pair.next().ok_or(ProtoverError::Unparseable)?; let high = pair.next().ok_or(ProtoverError::Unparseable)?; - let lo: Version = low.parse().or(Err(ProtoverError::Unparseable))?; + let lo: Version = low.parse().or(Err(ProtoverError::Unparseable))?; let hi: Version = high.parse().or(Err(ProtoverError::Unparseable))?; - if lo == u32::MAX || hi == u32::MAX { - return Err(ProtoverError::ExceedsMax); - } pairs.push((lo, hi)); } else { let v: u32 = p.parse().or(Err(ProtoverError::Unparseable))?;

1 0