tor-commits July 2017

tor-commits@lists.torproject.org

14 participants
1743 discussions

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit 6252e04a37c8d23e2e6164d20a566fad743a1a37 Merge: baf53300d 911e2dc53 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 09:50:26 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23053 | 5 +++++ src/or/config.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/master] Fix a small memory leak when parsing unix: ports twice
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit 9a0f38a349293f188a81b86d5b7639175a1cf334 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 09:49:42 2017 -0400 Fix a small memory leak when parsing unix: ports twice Fixes bug 23053; CID 1415725. --- changes/bug23053 | 5 +++++ src/or/config.c | 1 + 2 files changed, 6 insertions(+) diff --git a/changes/bug23053 b/changes/bug23053 new file mode 100644 index 000000000..082e23940 --- /dev/null +++ b/changes/bug23053 @@ -0,0 +1,5 @@ + o Minor bugfixes (memory leak): + - Fix a small memory leak when validating a configuration that + uses two or more AF_UNIX sockets for the same port type. + Fixes bug 23053; bugfix on 0.2.6.3-alpha. This is CID + 1415725. diff --git a/src/or/config.c b/src/or/config.c index 3693cdf83..d5298f0eb 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6877,6 +6877,7 @@ parse_port_config(smartlist_t *out, SMARTLIST_FOREACH(elts, char *, cp, tor_free(cp)); smartlist_clear(elts); tor_free(addrport); + tor_free(unix_socket_path); } if (warn_nonlocal && out) {

1 0

[tor/release-0.3.1] Fix a small memory leak when parsing unix: ports twice
by nickm＠torproject.org 28 Jul '17

28 Jul '17

1 0

[tor/master] Merge branch 'bug23053_029' into maint-0.3.1
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit 911e2dc5308d4cbd3f2c7e78e38055cb36c908fb Merge: af3079a49 9a0f38a34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 09:50:16 2017 -0400 Merge branch 'bug23053_029' into maint-0.3.1 changes/bug23053 | 5 +++++ src/or/config.c | 1 + 2 files changed, 6 insertions(+)

1 0

[tor/release-0.3.1] Merge branch 'bug23053_029' into maint-0.3.1
by nickm＠torproject.org 28 Jul '17

28 Jul '17

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 28 Jul '17

28 Jul '17

commit 3205700bc42bd3350defc569709b562a6adff0fd Merge: 8c2ccf937 911e2dc53 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 28 09:50:26 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23053 | 5 +++++ src/or/config.c | 1 + 2 files changed, 6 insertions(+)

1 0

[webwml/master] Add new Tor Browser version: 7.5a3, for Linux only
by gk＠torproject.org 28 Jul '17

28 Jul '17

commit 491942bf414390468edd5b74d53073f7055e9251 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 28 11:09:06 2017 +0000 Add new Tor Browser version: 7.5a3, for Linux only Now after the bundles got synced to disk. --- include/versions.wmi | 8 ++++---- projects/torbrowser/RecommendedTBBVersions | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 3a6f0a69..1539fe3b 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -14,10 +14,10 @@ <define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-07-27</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>7.0.3</define-tag> <define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-07-27</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.5a2</define-tag> -<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-07-06</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.5a2</define-tag> -<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-07-06</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.5a3</define-tag> +<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-07-28</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.5a3</define-tag> +<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-07-28</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>7.0.2</define-tag> <define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-07-04</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index ff7db1d9..d1d8f448 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -7,5 +7,7 @@ "7.5a2", "7.5a2-Linux", "7.5a2-MacOS", -"7.5a2-Windows" +"7.5a2-Windows", +"7.5a3", +"7.5a3-Linux" ]

1 0

[webwml/master] Revert "Add new Tor Browser version: 7.5a3, for Linux only"
by gk＠torproject.org 28 Jul '17

28 Jul '17

commit 65ea5d135175195f3cd3ee5c91efc5d93e265adb Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 28 08:56:45 2017 +0000 Revert "Add new Tor Browser version: 7.5a3, for Linux only" This reverts commit b46f550980c0e8585bb299e35be93d902564ee21. Let's push the bundles to dist first. --- include/versions.wmi | 8 ++++---- projects/torbrowser/RecommendedTBBVersions | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 1539fe3b..3a6f0a69 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -14,10 +14,10 @@ <define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-07-27</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>7.0.3</define-tag> <define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-07-27</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.5a3</define-tag> -<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-07-28</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.5a3</define-tag> -<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-07-28</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.5a2</define-tag> +<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-07-06</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.5a2</define-tag> +<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-07-06</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>7.0.2</define-tag> <define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-07-04</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index d1d8f448..ff7db1d9 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -7,7 +7,5 @@ "7.5a2", "7.5a2-Linux", "7.5a2-MacOS", -"7.5a2-Windows", -"7.5a3", -"7.5a3-Linux" +"7.5a2-Windows" ]

1 0

[webwml/master] Add new Tor Browser version: 7.5a3, for Linux only
by gk＠torproject.org 28 Jul '17

28 Jul '17

commit b46f550980c0e8585bb299e35be93d902564ee21 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Jul 28 08:49:06 2017 +0000 Add new Tor Browser version: 7.5a3, for Linux only --- include/versions.wmi | 8 ++++---- projects/torbrowser/RecommendedTBBVersions | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/include/versions.wmi b/include/versions.wmi index 3a6f0a69..1539fe3b 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -14,10 +14,10 @@ <define-tag releasedate-torbrowserbundlelinux32 whitespace=delete>2017-07-27</define-tag> <define-tag version-torbrowserbundlelinux64 whitespace=delete>7.0.3</define-tag> <define-tag releasedate-torbrowserbundlelinux64 whitespace=delete>2017-07-27</define-tag> -<define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.5a2</define-tag> -<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-07-06</define-tag> -<define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.5a2</define-tag> -<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-07-06</define-tag> +<define-tag version-torbrowserbundlelinux32beta whitespace=delete>7.5a3</define-tag> +<define-tag releasedate-torbrowserbundlelinux32beta whitespace=delete>2017-07-28</define-tag> +<define-tag version-torbrowserbundlelinux64beta whitespace=delete>7.5a3</define-tag> +<define-tag releasedate-torbrowserbundlelinux64beta whitespace=delete>2017-07-28</define-tag> <define-tag version-torbrowserbundleosx32 whitespace=delete>7.0.2</define-tag> <define-tag releasedate-torbrowserbundleosx32 whitespace=delete>2017-07-04</define-tag> diff --git a/projects/torbrowser/RecommendedTBBVersions b/projects/torbrowser/RecommendedTBBVersions index ff7db1d9..d1d8f448 100644 --- a/projects/torbrowser/RecommendedTBBVersions +++ b/projects/torbrowser/RecommendedTBBVersions @@ -7,5 +7,7 @@ "7.5a2", "7.5a2-Linux", "7.5a2-MacOS", -"7.5a2-Windows" +"7.5a2-Windows", +"7.5a3", +"7.5a3-Linux" ]

1 0

[metrics-lib/master] Add test for #22912.
by karsten＠torproject.org 28 Jul '17

28 Jul '17

commit d00a28fe2d7d451b2c4e3d033e259e5c786294e6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jul 14 11:19:45 2017 +0200 Add test for #22912. --- .../torproject/descriptor/impl/TorperfResultImplTest.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java index f648c7b..d9e134d 100644 --- a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java @@ -6,12 +6,14 @@ package org.torproject.descriptor.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParseException; import org.junit.Test; +import java.nio.charset.StandardCharsets; import java.util.List; public class TorperfResultImplTest { @@ -63,6 +65,19 @@ public class TorperfResultImplTest { ((TorperfResultImpl)(result.get(2))).getAnnotations().size()); } + @Test + public void testTrailingNewlinesRetained() throws Exception { + byte[] asciiBytes = (torperfAnnotation + input + + torperfAnnotation + input).getBytes("US-ASCII"); + List<Descriptor> result = TorperfResultImpl.parseTorperfResults( + asciiBytes, null); + for (Descriptor descriptor : result) { + assertTrue("Expected trailing newline.", + new String(descriptor.getRawDescriptorBytes(), + StandardCharsets.US_ASCII).endsWith("\n")); + } + } + private static long[] deciles = new long[] { 1441065602980L, 1441065603030L, 1441065603090L, 1441065603120L, 1441065603230L, 1441065603250L, 1441065603310L, 1441065603370L,

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
175
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2017