date:20180612

[tor-commits] [snowflake/master] Log to io.Discard if no log file is set.

2018-06-12 Thread dcf

commit 6077141f4affdab9b7ce97a9b1c6859825eaaa29
Author: David Fifield 
Date:   Sun Jun 10 16:41:32 2018 -0700

Log to io.Discard if no log file is set.

https://bugs.torproject.org/25600#comment:14

Snowflake in Tor Browser has been hanging after surfing for a while.
(Tor reports "no running bridges".) It only began happening after commit
12922a232b, which caused snowflake-client not to log to a file by
default (leaving it to log to its default stderr). What seems to be
happening is that tor doesn't read from its PT clients' stderr, leaving
a buffer to fill up that eventually causes a hang.
---
 client/snowflake.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/client/snowflake.go b/client/snowflake.go
index e0f9746..a9841be 100644
--- a/client/snowflake.go
+++ b/client/snowflake.go
@@ -150,6 +150,8 @@ func main() {
}
defer logFile.Close()
log.SetOutput(logFile)
+   } else {
+   log.SetOutput(ioutil.Discard)
}
 
log.Println("\n\n\n --- Starting Snowflake Client ---")

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere] Removing da_DK

2018-06-12 Thread translation

commit 0974512eae0a87991aaa674e19aac9431cf2c92c
Author: Translation commit bot 
Date:   Tue Jun 12 18:55:49 2018 +

Removing da_DK
---
 da_DK/https-everywhere.dtd|  53 
 da_DK/https-everywhere.properties |   8 ---
 da_DK/ssl-observatory.dtd | 101 --
 3 files changed, 162 deletions(-)

diff --git a/da_DK/https-everywhere.dtd b/da_DK/https-everywhere.dtd
deleted file mode 100644
index 0bbb1fee4..0
--- a/da_DK/https-everywhere.dtd
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/da_DK/https-everywhere.properties 
b/da_DK/https-everywhere.properties
deleted file mode 100644
index be838311a..0
--- a/da_DK/https-everywhere.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-https-everywhere.menu.globalEnable = Enable HTTPS Everywhere
-https-everywhere.menu.globalDisable = Disable HTTPS Everywhere
-https-everywhere.menu.enableDisable = Enable / Disable Rules
-https-everywhere.menu.noRules = (No Rules for This Page)
-https-everywhere.menu.unknownRules = (Rules for This Page Unknown)
-https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle 
it on a site-by-site basis by clicking the icon in the address bar.
-https-everywhere.migration.notification0 = In order to implement a crucial 
fix, this update resets your HTTPS Everywhere rule preferences to their default 
values.
-https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests
diff --git a/da_DK/ssl-observatory.dtd b/da_DK/ssl-observatory.dtd
deleted file mode 100644
index 69f1cfd69..0
--- a/da_DK/ssl-observatory.dtd
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-https://www.something.com, the certificate
-received by the Observatory will indicate that somebody visited
-www.something.com, but not who visited the site, or what specific page they
-looked at.  Mouseover the options for further details:">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] Move Linda to the past contributor section

2018-06-12 Thread atagar

commit 4f62c9183e68dde350671d167f0f6ed4652006c4
Author: Damian Johnson 
Date:   Tue Jun 12 10:23:56 2018 -0700

Move Linda to the past contributor section
---
 about/en/contributors.wml |  3 ++
 about/en/corepeople.wml   | 87 +--
 2 files changed, 41 insertions(+), 49 deletions(-)

diff --git a/about/en/contributors.wml b/about/en/contributors.wml
index 74fbe4f3..abf81554 100644
--- a/about/en/contributors.wml
+++ b/about/en/contributors.wml
@@ -152,6 +152,9 @@ href="http://www.globalvoicesonline.org/;>Global Voices 
Online.
 Helps make sure everything runs smoothly. Coordinates
 logistics and people and everything in between.
 
+Linda Lee
+Former UX team lead.
+
 Bruce Leidl
 Lead developer of
 http://www.subgraph.com/orchid.html;>Orchid,
diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 1ee43780..93825127 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -468,15 +468,6 @@
 
   
 
-  
-  
-  https://db.torproject.org/fetchkey.cgi?fingerprint=FA0AC9BE2881B3479F4FC0D7BE70F8265ED28FA2;>
-  Linda Lee
-  IRC: linda
-  Former UX team lead.
-
-
-
   
   
   https://db.torproject.org/fetchkey.cgi?fingerprint=8C4CD511095E982EB0EFBFA21E8BF34923291265;>
@@ -484,9 +475,7 @@
   IRC: ln5
   Swedish advocate and Tor Board member. Works on 
implementing IPv6 in Tor, build automation, and runs a directory 
authority.
 
-  
 
-  
 
   
   
@@ -496,7 +485,9 @@
   IRC: agrabeli
   Maria manages OONI's Partnership Program and 
writes research reports on internet censorship around the world.
 
+  
 
+  
 
   
   
@@ -505,9 +496,7 @@
   IRC: mcs
   Developer on the Tor Browser team.
 
-  
 
-  
 
   
   
@@ -515,7 +504,9 @@
   Matt Blaze
   Chairs the Tor Board of Directors. Professor at 
the University of Pennsylvania where he researches security, privacy, and 
anonymity.
 
+  
 
+  
 
   
   
@@ -524,9 +515,7 @@
   IRC: pastly
   http://mattssi4lhud.onion/;>Implemented the http://www.robgjansen.com/publications/kist-sec2014.pdf;>KIST 
scheduler into Tor. Helps safely measure Tor. Says helpful things on 
IRC.
 
-  
 
-  
 
   
   
@@ -536,7 +525,9 @@
   IRC: sysrqb
   Worked on tor, torsocks, and many other 
projects. Helped maintain and develop BridgeDB.
 
+  
 
+  
 
   
   
@@ -546,9 +537,7 @@
   IRC: meejah
   https://meejah.ca;>Author of https://github.com/meejah/txtorcon;>txtorcon, https://github.com/meejah/carml;>carml and other Tor Python tools 
including some for bad-relay hunting.
 
-  
 
-  
 
   
   
@@ -558,7 +547,9 @@
   IRC: mtigas
   Works on https://mike.tig.as/onionbrowser/;>Onion Browser, iOS, and 
hacker-journalist at https://www.propublica.org/;>ProPublica 
running their https://www.propub3r6espa33w.onion/;>onion 
service.
 
+  
 
+  
 
   
   
@@ -567,9 +558,7 @@
   Moritz Bartl
   Co-founder of https://www.torservers.net/;>torservers.net, a network of non-profit 
organizations that run Tor exit relays.
 
-  
 
-  
 
   
   
@@ -578,7 +567,9 @@
   IRC: n8fr8
   Founder of the https://guardianproject.info/;>Guardian Project. Orbot lead developer 
and contributor to Orfox, Onion Browser and NetCipher SDK. Director of 
Technology at Tibet Action Institute.
 
+  
 
+  
 
   
   
@@ -586,9 +577,7 @@
   IRC: nickhopper
   https://www-users.cs.umn.edu/~hopper/;>Researcher interested in 
improving Tor's performance and resistance to traffic analysis. Some of my work 
is described https://www-users.cs.umn.edu/~hopper/research.html;>here.
 
-  
 
-  
 
   
   
@@ -598,7 +587,9 @@
   IRC: nickm
   One of the three original designers of Tor - 
does a lot of the ongoing design work, and coordinates and leads ongoing 
development.
 
+  
 
+  
 
   
   
@@ -607,9 +598,7 @@
   IRC: boklm
   Works on Tor Browser.
 
-  
 
-  
 
   
   
@@ -619,7 +608,9 @@
   IRC: mrphs
   His main area of interests are End-users 
Accessibility/Security, UX, Censorship, Advocacy and Onion Services.
 
+  
 
+  
 
   
   
@@ -629,9 +620,7 @@
   IRC: pari
   Works with UX and Community teams, and on Tor 
India initiatives. Started as an Outreachy intern.
 
-  
 
-  
 
   
   
@@ -639,7 +628,9 @@
   IRC: syverson
   https://www.nrl.navy.mil;>NRL 
researcher on most things Tor. Inventor of https://www.onion-router.net/;>onion routing, and one of the three 
original designers of Tor.
 
+  
 
+  
 
   
   
@@ -648,16 +639,16 @@
   Pepijn Le Heux
   Lawyer based in The Netherlands and co-founder 
of Hart voor Internetvrijheid.
 
-  
 
-  
 
   
   
   Peter Palfrader
   Manages the Debian packages, runs

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2018-06-12 Thread translation

commit f88cdd89eafcb3430894ae9e9b37c402413982ba
Author: Translation commit bot 
Date:   Tue Jun 12 17:17:18 2018 +

Update translations for torbutton-torbuttondtd
---
 ka/torbutton.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ka/torbutton.dtd b/ka/torbutton.dtd
index 200844e06..eed543af7 100644
--- a/ka/torbutton.dtd
+++ b/ka/torbutton.dtd
@@ -41,7 +41,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttonproperties] Update translations for torbutton-torbuttonproperties

2018-06-12 Thread translation

commit 5e142795b2445404b395702ce9003f13da7fab28
Author: Translation commit bot 
Date:   Tue Jun 12 17:17:09 2018 +

Update translations for torbutton-torbuttonproperties
---
 ka/torbutton.properties | 50 -
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/ka/torbutton.properties b/ka/torbutton.properties
index 468a532dd..41d09a512 100644
--- a/ka/torbutton.properties
+++ b/ka/torbutton.properties
@@ -1,53 +1,53 @@
-torbutton.circuit_display.internet = Internet
-torbutton.circuit_display.ip_unknown = IP unknown
-torbutton.circuit_display.onion_site = Onion site
-torbutton.circuit_display.this_browser = This browser
-torbutton.circuit_display.relay = Relay
-torbutton.circuit_display.tor_bridge = Bridge
-torbutton.circuit_display.unknown_country = Unknown country
-torbutton.circuit_display.guard = Guard
-torbutton.circuit_display.guard_note = Your [Guard] node may not change.
-torbutton.circuit_display.learn_more = Learn more
+torbutton.circuit_display.internet = ááá¢áá ááá¢á
+torbutton.circuit_display.ip_unknown = á£áªáááá IP 
ááá¡áááá áá
+torbutton.circuit_display.onion_site = ááááááá¡ á¡ááá¢á
+torbutton.circuit_display.this_browser = áá¡ áá áá£ááá á
+torbutton.circuit_display.relay = áá á®á
+torbutton.circuit_display.tor_bridge = á®ááá
+torbutton.circuit_display.unknown_country = á£áªáááá 
á¥ááá§ááá
+torbutton.circuit_display.guard = ááªáááá
+torbutton.circuit_display.guard_note = áá¥áááá [Guard] 
ááááá«á á¨áá¡áá«ááá áá  á¨áááªááááá¡.
+torbutton.circuit_display.learn_more = áááááá ááá¢á
 torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make 
the width and height of your window less distinctive, and thus reduces the 
ability of people to track you online.
-torbutton.panel.tooltip.disabled = Click to enable Tor
-torbutton.panel.tooltip.enabled = Click to disable Tor
-torbutton.panel.label.disabled = Tor Disabled
-torbutton.panel.label.enabled = Tor Enabled
+torbutton.panel.tooltip.disabled = áááááááá Tor-áá¡ 
á©áá¡áá ááááá
+torbutton.panel.tooltip.enabled = áááááááá Tor-áá¡ 
ááááá¡áá ááááá
+torbutton.panel.label.disabled = Tor ááááá áá£ááá
+torbutton.panel.label.enabled = Tor á©áá áá£ááá
 extensions.torbut...@torproject.org.description = Torbutton provides a button 
to configure Tor settings and quickly and easily clear private browsing data.
 torbutton.popup.external.title = Download an external file type?
-torbutton.popup.external.app = Tor Browser cannot display this file. You will 
need to open it with another application.\n\n
+torbutton.popup.external.app = Tor áá áá£ááá áá ááá  
á®áá á®áááá áá á¤ááááá¡ ááá®á¡áá. 
á¡áááá áá áááá®á¡ááá¡ á¡á®áá 
áááááááªááá.\n\n
 torbutton.popup.external.note = Some types of files can cause applications to 
connect to the Internet without using Tor.\n\n
 torbutton.popup.external.suggest = To be safe, you should only open downloaded 
files while offline, or use a Tor Live CD such as Tails.\n
-torbutton.popup.launch = Download file
-torbutton.popup.cancel = Cancel
-torbutton.popup.dontask = Automatically download files from now on
+torbutton.popup.launch = á©áááá¢ááá ááá
+torbutton.popup.cancel = ááá£á¥áááá
+torbutton.popup.dontask = ááá¢áááá¢á£á áá 
á©ááááá¢ááá ááá¡ á¤áááááá ááááá 
áááá
 torbutton.popup.prompted_language = To give you more privacy, Torbutton can 
request the English language version of web pages. This may cause web pages 
that you prefer to read in your native language to display in English 
instead.\n\nWould you like to request English language web pages for better 
privacy?
 torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. 
It does not have access to the Tor Control Port.\n\nAre you running Tor Browser 
Bundle?
-torbutton.title.prompt_torbrowser = Important Torbutton Information
+torbutton.title.prompt_torbrowser = áááá¨ááááááááá 
ááá¤áá áááªáá Torbutton-áá¡ á¨áá¡áá®áá
 torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't 
turn it off any more.\n\nWe made this change because it isn't safe to use 
Torbutton in a browser that's also used for non-Tor browsing. There were too 
many bugs there that we couldn't fix any other way.\n\nIf you want to keep 
using Firefox normally, you should uninstall Torbutton and download Tor Browser 
Bundle. The privacy properties of Tor Browser are also superior to those of 
normal Firefox, even when Firefox is used with

[tor-commits] [translation/tails-misc] Update translations for tails-misc

2018-06-12 Thread translation

commit e05a0274cc0311396044294826ba8aaaed829dd7
Author: Translation commit bot 
Date:   Tue Jun 12 17:16:38 2018 +

Update translations for tails-misc
---
 ka.po | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ka.po b/ka.po
index 03356845e..f4b18b524 100644
--- a/ka.po
+++ b/ka.po
@@ -9,14 +9,14 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-12 19:03+0100\n"
-"PO-Revision-Date: 2018-04-12 19:07+\n"
-"Last-Translator: IDRASSI Mounir \n"
+"PO-Revision-Date: 2018-06-12 17:06+\n"
+"Last-Translator: GEveloper\n"
 "Language-Team: Georgian 
(http://www.transifex.com/otf/torproject/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ka\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
 
 #: 
config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39
 msgid "Tor is ready"
@@ -267,7 +267,7 @@ msgstr ""
 
 #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:83
 msgid "Learn more"
-msgstr ""
+msgstr "ááááá ááá¢á"
 
 #: config/chroot_local-includes/usr/local/bin/tor-browser:43
 msgid "Tor is not ready"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] copy 0.3.3.7 changelog forward to master

2018-06-12 Thread nickm

commit 1b04dab60c549d9f0d621e1a115cab8a49c839f9
Author: Nick Mathewson 
Date:   Tue Jun 12 12:06:26 2018 -0400

copy 0.3.3.7 changelog forward to master
---
 ChangeLog| 41 +
 ReleaseNotes | 41 +
 2 files changed, 82 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 31a334bbf..60583ac7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,44 @@
+Changes in version 0.3.3.7 - 2018-06-12
+  Tor 0.3.3.7 backports several changes from the 0.3.4.x series, including
+  fixes for bugs affecting compatibility and stability.
+
+  o Directory authority changes:
+- Add an IPv6 address for the "dannenberg" directory authority.
+  Closes ticket 26343.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the June 7 2018 Maxmind GeoLite2
+  Country database. Closes ticket 26351.
+
+  o Minor bugfixes (compatibility, openssl, backport from 0.3.4.2-alpha):
+- Work around a change in OpenSSL 1.1.1 where return values that
+  would previously indicate "no password" now indicate an empty
+  password. Without this workaround, Tor instances running with
+  OpenSSL 1.1.1 would accept descriptors that other Tor instances
+  would reject. Fixes bug 26116; bugfix on 0.2.5.16.
+
+  o Minor bugfixes (compilation, backport from 0.3.4.2-alpha):
+- Silence unused-const-variable warnings in zstd.h with some GCC
+  versions. Fixes bug 26272; bugfix on 0.3.1.1-alpha.
+
+  o Minor bugfixes (controller, backport from 0.3.4.2-alpha):
+- Improve accuracy of the BUILDTIMEOUT_SET control port event's
+  TIMEOUT_RATE and CLOSE_RATE fields. (We were previously
+  miscounting the total number of circuits for these field values.)
+  Fixes bug 26121; bugfix on 0.3.3.1-alpha.
+
+  o Minor bugfixes (hardening, backport from 0.3.4.2-alpha):
+- Prevent a possible out-of-bounds smartlist read in
+  protover_compute_vote(). Fixes bug 26196; bugfix on 0.2.9.4-alpha.
+
+  o Minor bugfixes (path selection, backport from 0.3.4.1-alpha):
+- Only select relays when they have the descriptors we prefer to use
+  for them. This change fixes a bug where we could select a relay
+  because it had _some_ descriptor, but reject it later with a
+  nonfatal assertion error because it didn't have the exact one we
+  wanted. Fixes bugs 25691 and 25692; bugfix on 0.3.3.4-alpha.
+
+
 Changes in version 0.3.4.2-alpha - 2018-06-12
   Tor 0.3.4.2-alpha fixes several minor bugs in the previous alpha
   release, and forward-ports an authority-only security fix from 0.3.3.6.
diff --git a/ReleaseNotes b/ReleaseNotes
index 5db488592..8a38289c2 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,47 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
+Changes in version 0.3.3.7 - 2018-06-12
+  Tor 0.3.3.7 backports several changes from the 0.3.4.x series, including
+  fixes for bugs affecting compatibility and stability.
+
+  o Directory authority changes:
+- Add an IPv6 address for the "dannenberg" directory authority.
+  Closes ticket 26343.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the June 7 2018 Maxmind GeoLite2
+  Country database. Closes ticket 26351.
+
+  o Minor bugfixes (compatibility, openssl, backport from 0.3.4.2-alpha):
+- Work around a change in OpenSSL 1.1.1 where return values that
+  would previously indicate "no password" now indicate an empty
+  password. Without this workaround, Tor instances running with
+  OpenSSL 1.1.1 would accept descriptors that other Tor instances
+  would reject. Fixes bug 26116; bugfix on 0.2.5.16.
+
+  o Minor bugfixes (compilation, backport from 0.3.4.2-alpha):
+- Silence unused-const-variable warnings in zstd.h with some GCC
+  versions. Fixes bug 26272; bugfix on 0.3.1.1-alpha.
+
+  o Minor bugfixes (controller, backport from 0.3.4.2-alpha):
+- Improve accuracy of the BUILDTIMEOUT_SET control port event's
+  TIMEOUT_RATE and CLOSE_RATE fields. (We were previously
+  miscounting the total number of circuits for these field values.)
+  Fixes bug 26121; bugfix on 0.3.3.1-alpha.
+
+  o Minor bugfixes (hardening, backport from 0.3.4.2-alpha):
+- Prevent a possible out-of-bounds smartlist read in
+  protover_compute_vote(). Fixes bug 26196; bugfix on 0.2.9.4-alpha.
+
+  o Minor bugfixes (path selection, backport from 0.3.4.1-alpha):
+- Only select relays when they have the descriptors we prefer to use
+  for them. This change fixes a bug where we could select a relay
+  because it had _some_ descriptor, but reject it later with a
+  nonfatal assertion error because it didn't have the exact one we
+  wanted. Fixes bugs 25691 and 25692; bugfix on 0.3.3.4-alpha.
+
+
 Changes in version 0.3.3.6 -

[tor-commits] [tor/maint-0.3.3] bump to 0.3.3.7-dev

2018-06-12 Thread nickm

commit 5f39bed9412b7b27b903fc1939b7774fb1b0
Author: Nick Mathewson 
Date:   Tue Jun 12 12:05:09 2018 -0400

bump to 0.3.3.7-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index e5c28b03b..0f147351d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.7])
+AC_INIT([tor],[0.3.3.7-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 56d227b08..15d0d32d6 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.7"
+!define VERSION "0.3.3.7-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5a3fd3c2f..2fd983172 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.7"
+#define VERSION "0.3.3.7-dev"
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

2018-06-12 Thread nickm

commit 147c67d81dd52c4b09546b69992c0633f4007649
Merge: ccf2d6561 5f39b
Author: Nick Mathewson 
Date:   Tue Jun 12 12:05:18 2018 -0400

Merge branch 'maint-0.3.3'

"ours" to avoid version bump.




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-12 Thread nickm

commit bc5d904237d3431163ae463488efbc063292e408
Merge: 035a35178 5f39b
Author: Nick Mathewson 
Date:   Tue Jun 12 12:05:32 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] bump to 0.3.4.2-alpha-dev

2018-06-12 Thread nickm

commit ccf2d65610a86dafdbee5af79ce9ffa4db54ce17
Author: Nick Mathewson 
Date:   Tue Jun 12 12:04:58 2018 -0400

bump to 0.3.4.2-alpha-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 37a2b5e18..d554ba8e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.4.2-alpha])
+AC_INIT([tor],[0.3.4.2-alpha-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 9bae48569..8181c9424 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.4.2-alpha"
+!define VERSION "0.3.4.2-alpha-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 3f0b19605..a201a76ac 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.4.2-alpha"
+#define VERSION "0.3.4.2-alpha-dev"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] bump to 0.3.3.7-dev

2018-06-12 Thread nickm

commit 5f39bed9412b7b27b903fc1939b7774fb1b0
Author: Nick Mathewson 
Date:   Tue Jun 12 12:05:09 2018 -0400

bump to 0.3.3.7-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index e5c28b03b..0f147351d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.7])
+AC_INIT([tor],[0.3.3.7-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 56d227b08..15d0d32d6 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.7"
+!define VERSION "0.3.3.7-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5a3fd3c2f..2fd983172 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.7"
+#define VERSION "0.3.3.7-dev"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] bump to 0.3.3.7-dev

2018-06-12 Thread nickm

commit 5f39bed9412b7b27b903fc1939b7774fb1b0
Author: Nick Mathewson 
Date:   Tue Jun 12 12:05:09 2018 -0400

bump to 0.3.3.7-dev
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index e5c28b03b..0f147351d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.7])
+AC_INIT([tor],[0.3.3.7-dev])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 56d227b08..15d0d32d6 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.7"
+!define VERSION "0.3.3.7-dev"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5a3fd3c2f..2fd983172 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.7"
+#define VERSION "0.3.3.7-dev"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [webwml/master] new source releases: 0.3.3.7 and 0.3.4.2-alpha

2018-06-12 Thread nickm

commit 78d21fc65b035c49479d01a9c0977886b1df482c
Author: Nick Mathewson 
Date:   Tue Jun 12 11:53:08 2018 -0400

new source releases: 0.3.3.7 and 0.3.4.2-alpha
---
 include/versions.wmi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/versions.wmi b/include/versions.wmi
index 739f7a36..76dc17ec 100644
--- a/include/versions.wmi
+++ b/include/versions.wmi
@@ -1,5 +1,5 @@
-0.3.3.6
-0.3.4.1-alpha
+0.3.3.7
+0.3.4.2-alpha
 
 maint-7.5
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Fold in changelog entry.

2018-06-12 Thread nickm

commit 035a35178c92da94400c13767a265053ff6c8413
Author: Nick Mathewson 
Date:   Tue Jun 12 09:47:25 2018 -0400

Fold in changelog entry.
---
 ChangeLog   | 4 
 ReleaseNotes| 4 
 changes/ticket26343 | 3 ---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f93bfc219..6fcf7aab4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ Changes in version 0.3.3.7 - 2018-06-12
   Tor 0.3.3.7 backports several changes from the 0.3.4.x series, including
   fixes for bugs affecting compatibility and stability.
 
+  o Directory authority changes:
+- Add an IPv6 address for the "dannenberg" directory authority.
+  Closes ticket 26343.
+
   o Minor features (geoip):
 - Update geoip and geoip6 to the June 7 2018 Maxmind GeoLite2
   Country database. Closes ticket 26351.
diff --git a/ReleaseNotes b/ReleaseNotes
index 1f1586a9b..ad2b7180f 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -6,6 +6,10 @@ Changes in version 0.3.3.7 - 2018-06-12
   Tor 0.3.3.7 backports several changes from the 0.3.4.x series, including
   fixes for bugs affecting compatibility and stability.
 
+  o Directory authority changes:
+- Add an IPv6 address for the "dannenberg" directory authority.
+  Closes ticket 26343.
+
   o Minor features (geoip):
 - Update geoip and geoip6 to the June 7 2018 Maxmind GeoLite2
   Country database. Closes ticket 26351.
diff --git a/changes/ticket26343 b/changes/ticket26343
deleted file mode 100644
index ab5f332ee..0
--- a/changes/ticket26343
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (directory authority):
-- Add an IPv6 address for the "dannenberg" directory
-  authority. Closes ticket 26343.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Fold in changelog entry.

2018-06-12 Thread nickm

commit bc951e83aac770d123118bf485d14490c2539048
Author: Nick Mathewson 
Date:   Tue Jun 12 09:47:07 2018 -0400

Fold in changelog entry.
---
 ChangeLog   | 4 
 changes/ticket26343 | 3 ---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b5b2f00ea..31a334bbf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ Changes in version 0.3.4.2-alpha - 2018-06-12
   Tor 0.3.4.2-alpha fixes several minor bugs in the previous alpha
   release, and forward-ports an authority-only security fix from 0.3.3.6.
 
+  o Directory authority changes:
+- Add an IPv6 address for the "dannenberg" directory authority.
+  Closes ticket 26343.
+
   o Major bugfixes (security, directory authority, denial-of-service, also in 
0.3.3.6):
 - Fix a bug that could have allowed an attacker to force a directory
   authority to use up all its RAM by passing it a maliciously
diff --git a/changes/ticket26343 b/changes/ticket26343
deleted file mode 100644
index ab5f332ee..0
--- a/changes/ticket26343
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor features (directory authority):
-- Add an IPv6 address for the "dannenberg" directory
-  authority. Closes ticket 26343.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-06-12 Thread nickm

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9
Merge: d84581a3e ef671147f
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2018-06-12 Thread nickm

commit 75732ef4cd45fa822d80b7f95330c5447a2b3e9a
Merge: bded08415 ef671147f
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-12 Thread nickm

commit 53513e4bfed4c6713509f239cad94ca5b4995246
Merge: 5d8a927aa 16381b579
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Add IPv6 orport address for dannenberg.

2018-06-12 Thread nickm

commit 6cf9288518edcba33e18d966c549d91d3eb4578a
Author: Linus Nordberg 
Date:   Sun Jun 10 11:07:00 2018 +0200

Add IPv6 orport address for dannenberg.
---
 src/or/auth_dirs.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
index 58e6817c8..e0937541e 100644
--- a/src/or/auth_dirs.inc
+++ b/src/or/auth_dirs.inc
@@ -16,6 +16,7 @@
   "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 "dannenberg orport=443 "
   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "ipv6=[2001:678:558:1000::244]:443 "
   "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 "maatuska orport=80 "
   "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

2018-06-12 Thread nickm

commit ef671147f21814ed505505ec96bfcf297bc6bb7a
Merge: ae540569c 2ef448da2
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:13 2018 -0400

Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-12 Thread nickm

commit 53513e4bfed4c6713509f239cad94ca5b4995246
Merge: 5d8a927aa 16381b579
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-06-12 Thread nickm

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9
Merge: d84581a3e ef671147f
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-12 Thread nickm

commit ce959b9424aef1fa04b0d4c21faa59f92e42b43d
Merge: ef0b19aec eaa359650
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

2018-06-12 Thread nickm

commit ef671147f21814ed505505ec96bfcf297bc6bb7a
Merge: ae540569c 2ef448da2
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:13 2018 -0400

Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-12 Thread nickm

commit eaa359650cd4654744f8750ee6a59d8653e96147
Merge: f2e7570c7 53513e4bf
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Add a changelog entry.

2018-06-12 Thread nickm

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a
Author: Linus Nordberg 
Date:   Sun Jun 10 13:09:38 2018 +0200

Add a changelog entry.
---
 changes/ticket26343 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket26343 b/changes/ticket26343
new file mode 100644
index 0..ab5f332ee
--- /dev/null
+++ b/changes/ticket26343
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "dannenberg" directory
+  authority. Closes ticket 26343.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

2018-06-12 Thread nickm

commit 03461d5d401d9d9ddfaabd6f09648d4338460449
Merge: b86c2c178 16381b579
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-06-12 Thread nickm

commit c62ab5417e02082eb1cced26913495ae60597a5b
Merge: a5c1b17e1 53513e4bf
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Add IPv6 orport address for dannenberg.

2018-06-12 Thread nickm

commit 6cf9288518edcba33e18d966c549d91d3eb4578a
Author: Linus Nordberg 
Date:   Sun Jun 10 11:07:00 2018 +0200

Add IPv6 orport address for dannenberg.
---
 src/or/auth_dirs.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
index 58e6817c8..e0937541e 100644
--- a/src/or/auth_dirs.inc
+++ b/src/or/auth_dirs.inc
@@ -16,6 +16,7 @@
   "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 "dannenberg orport=443 "
   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "ipv6=[2001:678:558:1000::244]:443 "
   "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 "maatuska orport=80 "
   "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Add IPv6 orport address for dannenberg.

2018-06-12 Thread nickm

commit 6cf9288518edcba33e18d966c549d91d3eb4578a
Author: Linus Nordberg 
Date:   Sun Jun 10 11:07:00 2018 +0200

Add IPv6 orport address for dannenberg.
---
 src/or/auth_dirs.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
index 58e6817c8..e0937541e 100644
--- a/src/or/auth_dirs.inc
+++ b/src/or/auth_dirs.inc
@@ -16,6 +16,7 @@
   "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 "dannenberg orport=443 "
   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "ipv6=[2001:678:558:1000::244]:443 "
   "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 "maatuska orport=80 "
   "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Add a changelog entry.

2018-06-12 Thread nickm

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a
Author: Linus Nordberg 
Date:   Sun Jun 10 13:09:38 2018 +0200

Add a changelog entry.
---
 changes/ticket26343 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket26343 b/changes/ticket26343
new file mode 100644
index 0..ab5f332ee
--- /dev/null
+++ b/changes/ticket26343
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "dannenberg" directory
+  authority. Closes ticket 26343.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-12 Thread nickm

commit eaa359650cd4654744f8750ee6a59d8653e96147
Merge: f2e7570c7 53513e4bf
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Add IPv6 orport address for dannenberg.

2018-06-12 Thread nickm

commit 6cf9288518edcba33e18d966c549d91d3eb4578a
Author: Linus Nordberg 
Date:   Sun Jun 10 11:07:00 2018 +0200

Add IPv6 orport address for dannenberg.
---
 src/or/auth_dirs.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
index 58e6817c8..e0937541e 100644
--- a/src/or/auth_dirs.inc
+++ b/src/or/auth_dirs.inc
@@ -16,6 +16,7 @@
   "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 "dannenberg orport=443 "
   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "ipv6=[2001:678:558:1000::244]:443 "
   "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 "maatuska orport=80 "
   "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-06-12 Thread nickm

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9
Merge: d84581a3e ef671147f
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Add a changelog entry.

2018-06-12 Thread nickm

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a
Author: Linus Nordberg 
Date:   Sun Jun 10 13:09:38 2018 +0200

Add a changelog entry.
---
 changes/ticket26343 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket26343 b/changes/ticket26343
new file mode 100644
index 0..ab5f332ee
--- /dev/null
+++ b/changes/ticket26343
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "dannenberg" directory
+  authority. Closes ticket 26343.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

2018-06-12 Thread nickm

commit ef671147f21814ed505505ec96bfcf297bc6bb7a
Merge: ae540569c 2ef448da2
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:13 2018 -0400

Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

2018-06-12 Thread nickm

commit ef671147f21814ed505505ec96bfcf297bc6bb7a
Merge: ae540569c 2ef448da2
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:13 2018 -0400

Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Add a changelog entry.

2018-06-12 Thread nickm

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a
Author: Linus Nordberg 
Date:   Sun Jun 10 13:09:38 2018 +0200

Add a changelog entry.
---
 changes/ticket26343 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket26343 b/changes/ticket26343
new file mode 100644
index 0..ab5f332ee
--- /dev/null
+++ b/changes/ticket26343
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "dannenberg" directory
+  authority. Closes ticket 26343.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-06-12 Thread nickm

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9
Merge: d84581a3e ef671147f
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Add a changelog entry.

2018-06-12 Thread nickm

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a
Author: Linus Nordberg 
Date:   Sun Jun 10 13:09:38 2018 +0200

Add a changelog entry.
---
 changes/ticket26343 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket26343 b/changes/ticket26343
new file mode 100644
index 0..ab5f332ee
--- /dev/null
+++ b/changes/ticket26343
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "dannenberg" directory
+  authority. Closes ticket 26343.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-12 Thread nickm

commit 53513e4bfed4c6713509f239cad94ca5b4995246
Merge: 5d8a927aa 16381b579
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

2018-06-12 Thread nickm

commit ef671147f21814ed505505ec96bfcf297bc6bb7a
Merge: ae540569c 2ef448da2
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:13 2018 -0400

Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

2018-06-12 Thread nickm

commit 03f3ee6d74d548b1f8ed10c475f450977c518b34
Merge: b13fe14cb eaa359650
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.3'

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Add a changelog entry.

2018-06-12 Thread nickm

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a
Author: Linus Nordberg 
Date:   Sun Jun 10 13:09:38 2018 +0200

Add a changelog entry.
---
 changes/ticket26343 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket26343 b/changes/ticket26343
new file mode 100644
index 0..ab5f332ee
--- /dev/null
+++ b/changes/ticket26343
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "dannenberg" directory
+  authority. Closes ticket 26343.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-12 Thread nickm

commit 53513e4bfed4c6713509f239cad94ca5b4995246
Merge: 5d8a927aa 16381b579
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-06-12 Thread nickm

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9
Merge: d84581a3e ef671147f
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-06-12 Thread nickm

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9
Merge: d84581a3e ef671147f
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-12 Thread nickm

commit eaa359650cd4654744f8750ee6a59d8653e96147
Merge: f2e7570c7 53513e4bf
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

2018-06-12 Thread nickm

commit ef671147f21814ed505505ec96bfcf297bc6bb7a
Merge: ae540569c 2ef448da2
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:13 2018 -0400

Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Add IPv6 orport address for dannenberg.

2018-06-12 Thread nickm

commit 6cf9288518edcba33e18d966c549d91d3eb4578a
Author: Linus Nordberg 
Date:   Sun Jun 10 11:07:00 2018 +0200

Add IPv6 orport address for dannenberg.
---
 src/or/auth_dirs.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
index 58e6817c8..e0937541e 100644
--- a/src/or/auth_dirs.inc
+++ b/src/or/auth_dirs.inc
@@ -16,6 +16,7 @@
   "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 "dannenberg orport=443 "
   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "ipv6=[2001:678:558:1000::244]:443 "
   "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 "maatuska orport=80 "
   "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-12 Thread nickm

commit 53513e4bfed4c6713509f239cad94ca5b4995246
Merge: 5d8a927aa 16381b579
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Add a changelog entry.

2018-06-12 Thread nickm

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a
Author: Linus Nordberg 
Date:   Sun Jun 10 13:09:38 2018 +0200

Add a changelog entry.
---
 changes/ticket26343 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket26343 b/changes/ticket26343
new file mode 100644
index 0..ab5f332ee
--- /dev/null
+++ b/changes/ticket26343
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "dannenberg" directory
+  authority. Closes ticket 26343.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Add IPv6 orport address for dannenberg.

2018-06-12 Thread nickm

commit 6cf9288518edcba33e18d966c549d91d3eb4578a
Author: Linus Nordberg 
Date:   Sun Jun 10 11:07:00 2018 +0200

Add IPv6 orport address for dannenberg.
---
 src/or/auth_dirs.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
index 58e6817c8..e0937541e 100644
--- a/src/or/auth_dirs.inc
+++ b/src/or/auth_dirs.inc
@@ -16,6 +16,7 @@
   "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 "dannenberg orport=443 "
   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "ipv6=[2001:678:558:1000::244]:443 "
   "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 "maatuska orport=80 "
   "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

2018-06-12 Thread nickm

commit ef671147f21814ed505505ec96bfcf297bc6bb7a
Merge: ae540569c 2ef448da2
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:13 2018 -0400

Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Add IPv6 orport address for dannenberg.

2018-06-12 Thread nickm

commit 6cf9288518edcba33e18d966c549d91d3eb4578a
Author: Linus Nordberg 
Date:   Sun Jun 10 11:07:00 2018 +0200

Add IPv6 orport address for dannenberg.
---
 src/or/auth_dirs.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
index 58e6817c8..e0937541e 100644
--- a/src/or/auth_dirs.inc
+++ b/src/or/auth_dirs.inc
@@ -16,6 +16,7 @@
   "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 "dannenberg orport=443 "
   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "ipv6=[2001:678:558:1000::244]:443 "
   "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 "maatuska orport=80 "
   "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Add a changelog entry.

2018-06-12 Thread nickm

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a
Author: Linus Nordberg 
Date:   Sun Jun 10 13:09:38 2018 +0200

Add a changelog entry.
---
 changes/ticket26343 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket26343 b/changes/ticket26343
new file mode 100644
index 0..ab5f332ee
--- /dev/null
+++ b/changes/ticket26343
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "dannenberg" directory
+  authority. Closes ticket 26343.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Add IPv6 orport address for dannenberg.

2018-06-12 Thread nickm

commit 6cf9288518edcba33e18d966c549d91d3eb4578a
Author: Linus Nordberg 
Date:   Sun Jun 10 11:07:00 2018 +0200

Add IPv6 orport address for dannenberg.
---
 src/or/auth_dirs.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
index 58e6817c8..e0937541e 100644
--- a/src/or/auth_dirs.inc
+++ b/src/or/auth_dirs.inc
@@ -16,6 +16,7 @@
   "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 "dannenberg orport=443 "
   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "ipv6=[2001:678:558:1000::244]:443 "
   "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 "maatuska orport=80 "
   "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.1

2018-06-12 Thread nickm

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9
Merge: d84581a3e ef671147f
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:17 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Add IPv6 orport address for dannenberg.

2018-06-12 Thread nickm

commit 6cf9288518edcba33e18d966c549d91d3eb4578a
Author: Linus Nordberg 
Date:   Sun Jun 10 11:07:00 2018 +0200

Add IPv6 orport address for dannenberg.
---
 src/or/auth_dirs.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
index 58e6817c8..e0937541e 100644
--- a/src/or/auth_dirs.inc
+++ b/src/or/auth_dirs.inc
@@ -16,6 +16,7 @@
   "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 "dannenberg orport=443 "
   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "ipv6=[2001:678:558:1000::244]:443 "
   "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 "maatuska orport=80 "
   "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Add a changelog entry.

2018-06-12 Thread nickm

commit 2ef448da2fb596b9f76d8e0f51f574343029cb0a
Author: Linus Nordberg 
Date:   Sun Jun 10 13:09:38 2018 +0200

Add a changelog entry.
---
 changes/ticket26343 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/ticket26343 b/changes/ticket26343
new file mode 100644
index 0..ab5f332ee
--- /dev/null
+++ b/changes/ticket26343
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+- Add an IPv6 address for the "dannenberg" directory
+  authority. Closes ticket 26343.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

2018-06-12 Thread nickm

commit ef671147f21814ed505505ec96bfcf297bc6bb7a
Merge: ae540569c 2ef448da2
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:13 2018 -0400

Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.2.9] Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

2018-06-12 Thread nickm

commit ef671147f21814ed505505ec96bfcf297bc6bb7a
Merge: ae540569c 2ef448da2
Author: Nick Mathewson 
Date:   Tue Jun 12 09:44:13 2018 -0400

Merge branch 'dannenberg_ipv6_029' into maint-0.2.9

 changes/ticket26343  | 3 +++
 src/or/auth_dirs.inc | 1 +
 2 files changed, 4 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-12 Thread nickm

commit ef0b19aec68bf48018f4c833778bc9b966ab9a25
Merge: 7b7b817c3 f2e7570c7
Author: Nick Mathewson 
Date:   Tue Jun 12 08:57:37 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Remove folded-in changes files

2018-06-12 Thread nickm

commit 73aae608d5e46251599dea9272862aa2560640d7
Author: Nick Mathewson 
Date:   Tue Jun 12 08:56:28 2018 -0400

Remove folded-in changes files
---
 changes/bug26272 | 3 ---
 changes/bug26283 | 4 
 changes/geoip-2018-06-07 | 4 
 3 files changed, 11 deletions(-)

diff --git a/changes/bug26272 b/changes/bug26272
deleted file mode 100644
index 9dcf42f0e..0
--- a/changes/bug26272
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (compilation):
-- Silence unused-const-variable warnings in zstd.h on some gcc versions.
-  Fixes bug 26272; bugfix on 0.3.1.1-alpha.
diff --git a/changes/bug26283 b/changes/bug26283
deleted file mode 100644
index 5ec856af8..0
--- a/changes/bug26283
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (C correctness):
-- Avoid casting return value of smartlist_len() to double as
-  compiler does not like it when -Wbad-function-cast is on.
-  Fixes bug 26283; bugfix on 0.2.4.10-alpha.
diff --git a/changes/geoip-2018-06-07 b/changes/geoip-2018-06-07
deleted file mode 100644
index 0f8cff97a..0
--- a/changes/geoip-2018-06-07
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor features (geoip):
-- Update geoip and geoip6 to the June 7 2018 Maxmind GeoLite2
-  Country database. Closes ticket 26351.
-



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] changelog for 0.3.3.7

2018-06-12 Thread nickm

commit 7b7b817c3ef68d7272ceec2ea0bdbd04684ae5dd
Author: Nick Mathewson 
Date:   Tue Jun 12 08:56:05 2018 -0400

changelog for 0.3.3.7
---
 ChangeLog| 37 +
 ReleaseNotes | 37 +
 changes/bug25691_again   |  6 --
 changes/bug26116 |  7 ---
 changes/bug26121 |  6 --
 changes/bug26196 |  4 
 changes/bug26272 |  3 ---
 changes/geoip-2018-06-07 |  4 
 8 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 89bb15ea7..f93bfc219 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,40 @@
+Changes in version 0.3.3.7 - 2018-06-12
+  Tor 0.3.3.7 backports several changes from the 0.3.4.x series, including
+  fixes for bugs affecting compatibility and stability.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the June 7 2018 Maxmind GeoLite2
+  Country database. Closes ticket 26351.
+
+  o Minor bugfixes (compatibility, openssl, backport from 0.3.4.2-alpha):
+- Work around a change in OpenSSL 1.1.1 where return values that
+  would previously indicate "no password" now indicate an empty
+  password. Without this workaround, Tor instances running with
+  OpenSSL 1.1.1 would accept descriptors that other Tor instances
+  would reject. Fixes bug 26116; bugfix on 0.2.5.16.
+
+  o Minor bugfixes (compilation, backport from 0.3.4.2-alpha):
+- Silence unused-const-variable warnings in zstd.h with some GCC
+  versions. Fixes bug 26272; bugfix on 0.3.1.1-alpha.
+
+  o Minor bugfixes (controller, backport from 0.3.4.2-alpha):
+- Improve accuracy of the BUILDTIMEOUT_SET control port event's
+  TIMEOUT_RATE and CLOSE_RATE fields. (We were previously
+  miscounting the total number of circuits for these field values.)
+  Fixes bug 26121; bugfix on 0.3.3.1-alpha.
+
+  o Minor bugfixes (hardening, backport from 0.3.4.2-alpha):
+- Prevent a possible out-of-bounds smartlist read in
+  protover_compute_vote(). Fixes bug 26196; bugfix on 0.2.9.4-alpha.
+
+  o Minor bugfixes (path selection, backport from 0.3.4.1-alpha):
+- Only select relays when they have the descriptors we prefer to use
+  for them. This change fixes a bug where we could select a relay
+  because it had _some_ descriptor, but reject it later with a
+  nonfatal assertion error because it didn't have the exact one we
+  wanted. Fixes bugs 25691 and 25692; bugfix on 0.3.3.4-alpha.
+
+
 Changes in version 0.3.3.6 - 2018-05-22
   Tor 0.3.3.6 is the first stable release in the 0.3.3 series. It
   backports several important fixes from the 0.3.4.1-alpha.
diff --git a/ReleaseNotes b/ReleaseNotes
index d36f87eea..1f1586a9b 100644
--- a/ReleaseNotes
+++ b/ReleaseNotes
@@ -2,6 +2,43 @@ This document summarizes new features and bugfixes in each 
stable
 release of Tor. If you want to see more detailed descriptions of the
 changes in each development snapshot, see the ChangeLog file.
 
+Changes in version 0.3.3.7 - 2018-06-12
+  Tor 0.3.3.7 backports several changes from the 0.3.4.x series, including
+  fixes for bugs affecting compatibility and stability.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the June 7 2018 Maxmind GeoLite2
+  Country database. Closes ticket 26351.
+
+  o Minor bugfixes (compatibility, openssl, backport from 0.3.4.2-alpha):
+- Work around a change in OpenSSL 1.1.1 where return values that
+  would previously indicate "no password" now indicate an empty
+  password. Without this workaround, Tor instances running with
+  OpenSSL 1.1.1 would accept descriptors that other Tor instances
+  would reject. Fixes bug 26116; bugfix on 0.2.5.16.
+
+  o Minor bugfixes (compilation, backport from 0.3.4.2-alpha):
+- Silence unused-const-variable warnings in zstd.h with some GCC
+  versions. Fixes bug 26272; bugfix on 0.3.1.1-alpha.
+
+  o Minor bugfixes (controller, backport from 0.3.4.2-alpha):
+- Improve accuracy of the BUILDTIMEOUT_SET control port event's
+  TIMEOUT_RATE and CLOSE_RATE fields. (We were previously
+  miscounting the total number of circuits for these field values.)
+  Fixes bug 26121; bugfix on 0.3.3.1-alpha.
+
+  o Minor bugfixes (hardening, backport from 0.3.4.2-alpha):
+- Prevent a possible out-of-bounds smartlist read in
+  protover_compute_vote(). Fixes bug 26196; bugfix on 0.2.9.4-alpha.
+
+  o Minor bugfixes (path selection, backport from 0.3.4.1-alpha):
+- Only select relays when they have the descriptors we prefer to use
+  for them. This change fixes a bug where we could select a relay
+  because it had _some_ descriptor, but reject it later with a
+  nonfatal assertion error because it didn't have the exact one we
+  wanted. Fixes bugs 25691 and 25692; bugfix on 0.3.3.4-alpha.
+
+
 Changes in version 0.3.3.6 - 2018-05-22
   Tor 0.3.3.6 is the first stable release in

[tor-commits] [tor/master] Bump to 0.3.3.7

2018-06-12 Thread nickm

commit f2e7570c75ec8d0f0415530461a4c5b3695fc671
Author: Nick Mathewson 
Date:   Tue Jun 12 08:57:09 2018 -0400

Bump to 0.3.3.7
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index f7e3c1e94..e5c28b03b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.6-dev])
+AC_INIT([tor],[0.3.3.7])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 11ca7e2e3..56d227b08 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.6-dev"
+!define VERSION "0.3.3.7"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5b3ea62f2..5a3fd3c2f 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.6-dev"
+#define VERSION "0.3.3.7"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Bump to 0.3.3.7

2018-06-12 Thread nickm

commit f2e7570c75ec8d0f0415530461a4c5b3695fc671
Author: Nick Mathewson 
Date:   Tue Jun 12 08:57:09 2018 -0400

Bump to 0.3.3.7
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index f7e3c1e94..e5c28b03b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.6-dev])
+AC_INIT([tor],[0.3.3.7])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 11ca7e2e3..56d227b08 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.6-dev"
+!define VERSION "0.3.3.7"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5b3ea62f2..5a3fd3c2f 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.6-dev"
+#define VERSION "0.3.3.7"
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

2018-06-12 Thread nickm

commit b13fe14cb0fca9f747ca4f83fbde3e5cc3fa0576
Merge: 73aae608d f2e7570c7
Author: Nick Mathewson 
Date:   Tue Jun 12 08:57:25 2018 -0400

Merge branch 'maint-0.3.3'

"ours" merge to avoid version bump.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Bump to 0.3.3.7

2018-06-12 Thread nickm

commit f2e7570c75ec8d0f0415530461a4c5b3695fc671
Author: Nick Mathewson 
Date:   Tue Jun 12 08:57:09 2018 -0400

Bump to 0.3.3.7
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index f7e3c1e94..e5c28b03b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.3.6-dev])
+AC_INIT([tor],[0.3.3.7])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 11ca7e2e3..56d227b08 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.3.6-dev"
+!define VERSION "0.3.3.7"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5b3ea62f2..5a3fd3c2f 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.3.6-dev"
+#define VERSION "0.3.3.7"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Lightly edit changelog

2018-06-12 Thread nickm

commit 4540ddd3e3d9807601c0f9c971cf84cabdc10d5f
Author: Nick Mathewson 
Date:   Tue Jun 12 08:46:35 2018 -0400

Lightly edit changelog

Remove the "documentation" section, since a comment-only change
doesn't usually get a changelog entry.
---
 ChangeLog | 19 ++-
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 181b8e16f..b5b2f00ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,11 +17,6 @@ Changes in version 0.3.4.2-alpha - 2018-06-12
 - Update geoip and geoip6 to the June 7 2018 Maxmind GeoLite2
   Country database. Closes ticket 26351.
 
-  o Minor bugfixes (C correctness):
-- Avoid casting return value of smartlist_len() to double as
-  compiler does not like it when -Wbad-function-cast is on. Fixes
-  bug 26283; bugfix on 0.2.4.10-alpha.
-
   o Minor bugfixes (compatibility, openssl):
 - Work around a change in OpenSSL 1.1.1 where return values that
   would previously indicate "no password" now indicate an empty
@@ -30,10 +25,13 @@ Changes in version 0.3.4.2-alpha - 2018-06-12
   would reject. Fixes bug 26116; bugfix on 0.2.5.16.
 
   o Minor bugfixes (compilation):
-- Silence unused-const-variable warnings in zstd.h on some gcc
+- Silence unused-const-variable warnings in zstd.h with some GCC
   versions. Fixes bug 26272; bugfix on 0.3.1.1-alpha.
-- Fix compilation when building with OpenSSL 1.1.0 with the "no-
-  deprecated" flag enabled. Fixes bug 26156; bugfix on 0.3.4.1-alpha.
+- Fix compilation when using OpenSSL 1.1.0 with the "no-deprecated"
+  flag enabled. Fixes bug 26156; bugfix on 0.3.4.1-alpha.
+- Avoid a compiler warning when casting the return value of
+  smartlist_len() to double with DEBUG_SMARTLIST enabled. Fixes bug
+  26283; bugfix on 0.2.4.10-alpha.
 
   o Minor bugfixes (control port):
 - Do not count 0-length RELAY_COMMAND_DATA cells as valid data in
@@ -61,11 +59,6 @@ Changes in version 0.3.4.2-alpha - 2018-06-12
   from its output. Fixes bugs 26101 and 26102; bugfix
   on 0.2.5.1-alpha.
 
-  o Documentation:
-- In code comment, point the reader to the exact section in Tor
-  specification that specifies circuit close error code values.
-  Resolves ticket 25237.
-
 
 Changes in version 0.3.3.6 - 2018-05-22
   Tor 0.3.3.6 is the first stable release in the 0.3.3 series. It

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] format changelog.

2018-06-12 Thread nickm

commit e9ecb09786763a65838b9760e5d14dd3b4956b25
Author: Nick Mathewson 
Date:   Tue Jun 12 08:36:48 2018 -0400

format changelog.
---
 ChangeLog | 80 ++-
 1 file changed, 38 insertions(+), 42 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 93a58647f..181b8e16f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,74 +1,70 @@
 Changes in version 0.3.4.2-alpha - 2018-06-12
-  Tor 0.3.4.2-alpha fixes several minor bugs in the previous alpha release,
-  and forward-ports an authority-only security fix from 0.3.3.6.
+  Tor 0.3.4.2-alpha fixes several minor bugs in the previous alpha
+  release, and forward-ports an authority-only security fix from 0.3.3.6.
 
   o Major bugfixes (security, directory authority, denial-of-service, also in 
0.3.3.6):
-- Fix a bug that could have allowed an attacker to force a
-  directory authority to use up all its RAM by passing it a
-  maliciously crafted protocol versions string. Fixes bug 25517;
-  bugfix on 0.2.9.4-alpha.  This issue is also tracked as
-  TROVE-2018-005.
+- Fix a bug that could have allowed an attacker to force a directory
+  authority to use up all its RAM by passing it a maliciously
+  crafted protocol versions string. Fixes bug 25517; bugfix on
+  0.2.9.4-alpha. This issue is also tracked as TROVE-2018-005.
 
   o Minor features (continuous integration):
 - Add the necessary configuration files for continuous integration
-  testing on Windows, via the Appveyor platform. Closes ticket 25549.
-  Patches from Marcin CieÅlak and Isis Lovecruft.
-
-  o Minor bugfixes (compatibility, openssl):
-- Work around a change in OpenSSL 1.1.1 where
-  return values that would previously indicate "no password" now
-  indicate an empty password. Without this workaround, Tor instances
-  running with OpenSSL 1.1.1 would accept descriptors that other Tor
-  instances would reject. Fixes bug 26116; bugfix on 0.2.5.16.
-
-  o Minor bugfixes (compilation):
-- Silence unused-const-variable warnings in zstd.h on some gcc versions.
-  Fixes bug 26272; bugfix on 0.3.1.1-alpha.
-
-  o Minor bugfixes (C correctness):
-- Avoid casting return value of smartlist_len() to double as
-  compiler does not like it when -Wbad-function-cast is on.
-  Fixes bug 26283; bugfix on 0.2.4.10-alpha.
+  testing on Windows, via the Appveyor platform. Closes ticket
+  25549. Patches from Marcin CieÅlak and Isis Lovecruft.
 
   o Minor features (geoip):
 - Update geoip and geoip6 to the June 7 2018 Maxmind GeoLite2
   Country database. Closes ticket 26351.
 
+  o Minor bugfixes (C correctness):
+- Avoid casting return value of smartlist_len() to double as
+  compiler does not like it when -Wbad-function-cast is on. Fixes
+  bug 26283; bugfix on 0.2.4.10-alpha.
+
+  o Minor bugfixes (compatibility, openssl):
+- Work around a change in OpenSSL 1.1.1 where return values that
+  would previously indicate "no password" now indicate an empty
+  password. Without this workaround, Tor instances running with
+  OpenSSL 1.1.1 would accept descriptors that other Tor instances
+  would reject. Fixes bug 26116; bugfix on 0.2.5.16.
 
   o Minor bugfixes (compilation):
-- Fix compilation when building with OpenSSL 1.1.0 with the
-  "no-deprecated" flag enabled. Fixes bug 26156; bugfix on 0.3.4.1-alpha.
+- Silence unused-const-variable warnings in zstd.h on some gcc
+  versions. Fixes bug 26272; bugfix on 0.3.1.1-alpha.
+- Fix compilation when building with OpenSSL 1.1.0 with the "no-
+  deprecated" flag enabled. Fixes bug 26156; bugfix on 0.3.4.1-alpha.
 
   o Minor bugfixes (control port):
-- Do not count 0-length RELAY_COMMAND_DATA cells as valid data in CIRC_BW
-  events. Previously, such cells were counted entirely in the OVERHEAD
-  field. Now they are not. Fixes bug 26259; bugfix on 0.3.4.1-alpha.
+- Do not count 0-length RELAY_COMMAND_DATA cells as valid data in
+  CIRC_BW events. Previously, such cells were counted entirely in
+  the OVERHEAD field. Now they are not. Fixes bug 26259; bugfix
+  on 0.3.4.1-alpha.
 
   o Minor bugfixes (controller):
 - Improve accuracy of the BUILDTIMEOUT_SET control port event's
-  TIMEOUT_RATE and CLOSE_RATE fields. (We were previously miscounting
-  the total number of circuits for these field values.) Fixes bug
-  26121; bugfix on 0.3.3.1-alpha.
+  TIMEOUT_RATE and CLOSE_RATE fields. (We were previously
+  miscounting the total number of circuits for these field values.)
+  Fixes bug 26121; bugfix on 0.3.3.1-alpha.
 
   o Minor bugfixes (hardening):
 - Prevent a possible out-of-bounds smartlist read in
-  protover_compute_vote(). Fixes bug 26196; bugfix on
-  0.2.9.4-alpha.
+  protover_compute_vote(). Fixes bug 26196; bugfix on 0.2.9.4-alpha.
 
   o Minor bugfixes (onion services):
-

[tor-commits] [tor/master] add more entries to changelog

2018-06-12 Thread nickm

commit 33919d8e1d8f24c3b66aad00d73dd551f69fc4e6
Author: Nick Mathewson 
Date:   Tue Jun 12 08:36:28 2018 -0400

add more entries to changelog
---
 ChangeLog | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 4bdc524c8..93a58647f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,20 @@ Changes in version 0.3.4.2-alpha - 2018-06-12
   instances would reject. Fixes bug 26116; bugfix on 0.2.5.16.
 
   o Minor bugfixes (compilation):
+- Silence unused-const-variable warnings in zstd.h on some gcc versions.
+  Fixes bug 26272; bugfix on 0.3.1.1-alpha.
+
+  o Minor bugfixes (C correctness):
+- Avoid casting return value of smartlist_len() to double as
+  compiler does not like it when -Wbad-function-cast is on.
+  Fixes bug 26283; bugfix on 0.2.4.10-alpha.
+
+  o Minor features (geoip):
+- Update geoip and geoip6 to the June 7 2018 Maxmind GeoLite2
+  Country database. Closes ticket 26351.
+
+
+  o Minor bugfixes (compilation):
 - Fix compilation when building with OpenSSL 1.1.0 with the
   "no-deprecated" flag enabled. Fixes bug 26156; bugfix on 0.3.4.1-alpha.
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-12 Thread nickm

commit 5d8a927aa35c01c59dcf137827db27b92d034498
Merge: 74ac463e7 d84581a3e
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

2018-06-12 Thread nickm

commit d84581a3e677a6905125b619c590488c12a36ae8
Merge: 19f386852 8366be3b5
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:53 2018 -0400

Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-12 Thread nickm

commit 7fff99110b6d00dbd438ce9182474f045f996f3f
Merge: 6dca180ae 5d8a927aa
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Silence unused-const-variable warnings in zstd.h on some gcc versions

2018-06-12 Thread nickm

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8
Author: teor 
Date:   Sat Jun 2 14:08:01 2018 -0700

Silence unused-const-variable warnings in zstd.h on some gcc versions

Fixes bug 26272; bugfix on 0.3.1.1-alpha.
---
 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/changes/bug26272 b/changes/bug26272
new file mode 100644
index 0..9dcf42f0e
--- /dev/null
+++ b/changes/bug26272
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Silence unused-const-variable warnings in zstd.h on some gcc versions.
+  Fixes bug 26272; bugfix on 0.3.1.1-alpha.
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c
index 63e92ed22..11edfffa0 100644
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@ -19,7 +19,9 @@
 #include "compress_zstd.h"
 
 #ifdef HAVE_ZSTD
+DISABLE_GCC_WARNING(unused-const-variable)
 #include 
+ENABLE_GCC_WARNING(unused-const-variable)
 #endif
 
 /** Total number of bytes allocated for Zstandard state. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

2018-06-12 Thread nickm

commit a5c1b17e14402254ed162ca849914cb0103e49de
Merge: e1e914cd4 5d8a927aa
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3

2018-06-12 Thread nickm

commit 9ff769c4921f77bff0e0b7b76c53d4e5b1af7659
Merge: 3cca9a103 7fff99110
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-12 Thread nickm

commit 5d8a927aa35c01c59dcf137827db27b92d034498
Merge: 74ac463e7 d84581a3e
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Silence unused-const-variable warnings in zstd.h on some gcc versions

2018-06-12 Thread nickm

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8
Author: teor 
Date:   Sat Jun 2 14:08:01 2018 -0700

Silence unused-const-variable warnings in zstd.h on some gcc versions

Fixes bug 26272; bugfix on 0.3.1.1-alpha.
---
 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/changes/bug26272 b/changes/bug26272
new file mode 100644
index 0..9dcf42f0e
--- /dev/null
+++ b/changes/bug26272
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Silence unused-const-variable warnings in zstd.h on some gcc versions.
+  Fixes bug 26272; bugfix on 0.3.1.1-alpha.
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c
index 63e92ed22..11edfffa0 100644
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@ -19,7 +19,9 @@
 #include "compress_zstd.h"
 
 #ifdef HAVE_ZSTD
+DISABLE_GCC_WARNING(unused-const-variable)
 #include 
+ENABLE_GCC_WARNING(unused-const-variable)
 #endif
 
 /** Total number of bytes allocated for Zstandard state. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.3'

2018-06-12 Thread nickm

commit 6230dfaf14bb6b92a5afaa8e81d00da4f0805955
Merge: f4e51990b 7fff99110
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:57 2018 -0400

Merge branch 'maint-0.3.3'

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

diff --cc src/common/compress_zstd.c
index 4024f5594,193a0289f..316a3fb41
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@@ -18,15 -18,10 +18,17 @@@
  #include "compress.h"
  #include "compress_zstd.h"
  
 +#ifdef ENABLE_ZSTD_ADVANCED_APIS
 +/* This is a lie, but we make sure it doesn't get us in trouble by wrapping
 + * all invocations of zstd's static-only functions in a check to make sure
 + * that the compile-time version matches the run-time version. */
 +#define ZSTD_STATIC_LINKING_ONLY
 +#endif
 +
  #ifdef HAVE_ZSTD
+ DISABLE_GCC_WARNING(unused-const-variable)
  #include 
+ ENABLE_GCC_WARNING(unused-const-variable)
  #endif
  
  /** Total number of bytes allocated for Zstandard state. */

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-12 Thread nickm

commit 5d8a927aa35c01c59dcf137827db27b92d034498
Merge: 74ac463e7 d84581a3e
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Silence unused-const-variable warnings in zstd.h on some gcc versions

2018-06-12 Thread nickm

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8
Author: teor 
Date:   Sat Jun 2 14:08:01 2018 -0700

Silence unused-const-variable warnings in zstd.h on some gcc versions

Fixes bug 26272; bugfix on 0.3.1.1-alpha.
---
 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/changes/bug26272 b/changes/bug26272
new file mode 100644
index 0..9dcf42f0e
--- /dev/null
+++ b/changes/bug26272
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Silence unused-const-variable warnings in zstd.h on some gcc versions.
+  Fixes bug 26272; bugfix on 0.3.1.1-alpha.
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c
index 63e92ed22..11edfffa0 100644
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@ -19,7 +19,9 @@
 #include "compress_zstd.h"
 
 #ifdef HAVE_ZSTD
+DISABLE_GCC_WARNING(unused-const-variable)
 #include 
+ENABLE_GCC_WARNING(unused-const-variable)
 #endif
 
 /** Total number of bytes allocated for Zstandard state. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

2018-06-12 Thread nickm

commit b86c2c178d0545b7afeccfd2ac88ba8ea555d233
Merge: 086459091 d84581a3e
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

2018-06-12 Thread nickm

commit d84581a3e677a6905125b619c590488c12a36ae8
Merge: 19f386852 8366be3b5
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:53 2018 -0400

Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

2018-06-12 Thread nickm

commit d84581a3e677a6905125b619c590488c12a36ae8
Merge: 19f386852 8366be3b5
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:53 2018 -0400

Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-12 Thread nickm

commit 5d8a927aa35c01c59dcf137827db27b92d034498
Merge: 74ac463e7 d84581a3e
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-12 Thread nickm

commit 7fff99110b6d00dbd438ce9182474f045f996f3f
Merge: 6dca180ae 5d8a927aa
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Silence unused-const-variable warnings in zstd.h on some gcc versions

2018-06-12 Thread nickm

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8
Author: teor 
Date:   Sat Jun 2 14:08:01 2018 -0700

Silence unused-const-variable warnings in zstd.h on some gcc versions

Fixes bug 26272; bugfix on 0.3.1.1-alpha.
---
 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/changes/bug26272 b/changes/bug26272
new file mode 100644
index 0..9dcf42f0e
--- /dev/null
+++ b/changes/bug26272
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Silence unused-const-variable warnings in zstd.h on some gcc versions.
+  Fixes bug 26272; bugfix on 0.3.1.1-alpha.
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c
index 63e92ed22..11edfffa0 100644
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@ -19,7 +19,9 @@
 #include "compress_zstd.h"
 
 #ifdef HAVE_ZSTD
+DISABLE_GCC_WARNING(unused-const-variable)
 #include 
+ENABLE_GCC_WARNING(unused-const-variable)
 #endif
 
 /** Total number of bytes allocated for Zstandard state. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Silence unused-const-variable warnings in zstd.h on some gcc versions

2018-06-12 Thread nickm

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8
Author: teor 
Date:   Sat Jun 2 14:08:01 2018 -0700

Silence unused-const-variable warnings in zstd.h on some gcc versions

Fixes bug 26272; bugfix on 0.3.1.1-alpha.
---
 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/changes/bug26272 b/changes/bug26272
new file mode 100644
index 0..9dcf42f0e
--- /dev/null
+++ b/changes/bug26272
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Silence unused-const-variable warnings in zstd.h on some gcc versions.
+  Fixes bug 26272; bugfix on 0.3.1.1-alpha.
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c
index 63e92ed22..11edfffa0 100644
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@ -19,7 +19,9 @@
 #include "compress_zstd.h"
 
 #ifdef HAVE_ZSTD
+DISABLE_GCC_WARNING(unused-const-variable)
 #include 
+ENABLE_GCC_WARNING(unused-const-variable)
 #endif
 
 /** Total number of bytes allocated for Zstandard state. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

2018-06-12 Thread nickm

commit d84581a3e677a6905125b619c590488c12a36ae8
Merge: 19f386852 8366be3b5
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:53 2018 -0400

Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

2018-06-12 Thread nickm

commit d84581a3e677a6905125b619c590488c12a36ae8
Merge: 19f386852 8366be3b5
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:53 2018 -0400

Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

2018-06-12 Thread nickm

commit d84581a3e677a6905125b619c590488c12a36ae8
Merge: 19f386852 8366be3b5
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:53 2018 -0400

Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Silence unused-const-variable warnings in zstd.h on some gcc versions

2018-06-12 Thread nickm

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8
Author: teor 
Date:   Sat Jun 2 14:08:01 2018 -0700

Silence unused-const-variable warnings in zstd.h on some gcc versions

Fixes bug 26272; bugfix on 0.3.1.1-alpha.
---
 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/changes/bug26272 b/changes/bug26272
new file mode 100644
index 0..9dcf42f0e
--- /dev/null
+++ b/changes/bug26272
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Silence unused-const-variable warnings in zstd.h on some gcc versions.
+  Fixes bug 26272; bugfix on 0.3.1.1-alpha.
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c
index 63e92ed22..11edfffa0 100644
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@ -19,7 +19,9 @@
 #include "compress_zstd.h"
 
 #ifdef HAVE_ZSTD
+DISABLE_GCC_WARNING(unused-const-variable)
 #include 
+ENABLE_GCC_WARNING(unused-const-variable)
 #endif
 
 /** Total number of bytes allocated for Zstandard state. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Silence unused-const-variable warnings in zstd.h on some gcc versions

2018-06-12 Thread nickm

commit 8366be3b517d70a72cbedebaa492b6d7b2d2aab8
Author: teor 
Date:   Sat Jun 2 14:08:01 2018 -0700

Silence unused-const-variable warnings in zstd.h on some gcc versions

Fixes bug 26272; bugfix on 0.3.1.1-alpha.
---
 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/changes/bug26272 b/changes/bug26272
new file mode 100644
index 0..9dcf42f0e
--- /dev/null
+++ b/changes/bug26272
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Silence unused-const-variable warnings in zstd.h on some gcc versions.
+  Fixes bug 26272; bugfix on 0.3.1.1-alpha.
diff --git a/src/common/compress_zstd.c b/src/common/compress_zstd.c
index 63e92ed22..11edfffa0 100644
--- a/src/common/compress_zstd.c
+++ b/src/common/compress_zstd.c
@@ -19,7 +19,9 @@
 #include "compress_zstd.h"
 
 #ifdef HAVE_ZSTD
+DISABLE_GCC_WARNING(unused-const-variable)
 #include 
+ENABLE_GCC_WARNING(unused-const-variable)
 #endif
 
 /** Total number of bytes allocated for Zstandard state. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

2018-06-12 Thread nickm

commit d84581a3e677a6905125b619c590488c12a36ae8
Merge: 19f386852 8366be3b5
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:53 2018 -0400

Merge remote-tracking branch 'teor/bug26272-031' into maint-0.3.1

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

2018-06-12 Thread nickm

commit 7fff99110b6d00dbd438ce9182474f045f996f3f
Merge: 6dca180ae 5d8a927aa
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-06-12 Thread nickm

commit 5d8a927aa35c01c59dcf137827db27b92d034498
Merge: 74ac463e7 d84581a3e
Author: Nick Mathewson 
Date:   Tue Jun 12 08:18:56 2018 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug26272   | 3 +++
 src/common/compress_zstd.c | 2 ++
 2 files changed, 5 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/bug26283'

2018-06-12 Thread nickm

commit f4e51990b911161b26138f40f3d370eeafd9ac2f
Merge: b2470f514 9876575d2
Author: Nick Mathewson 
Date:   Tue Jun 12 08:17:48 2018 -0400

Merge remote-tracking branch 'rl1987/bug26283'

 changes/bug26283| 4 
 src/or/routerlist.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

1 2 >

1 - 100 of 128 matches

Mail list logo