[tor-commits] [translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed

2017-11-13 Thread translation
commit 41b63a487139018a0372983059c31c9e2d74bf30
Author: Translation commit bot 
Date:   Tue Nov 14 02:17:00 2017 +

Update translations for tor-launcher-network-settings_completed
---
 nb/network-settings.dtd | 62 ++---
 1 file changed, 22 insertions(+), 40 deletions(-)

diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd
index 56f41f147..3efa448f3 100644
--- a/nb/network-settings.dtd
+++ b/nb/network-settings.dtd
@@ -1,4 +1,7 @@
 
+
+
+
 
 
 
@@ -6,31 +9,11 @@
 
 
 
-
-
-
-
-
-
-
-
+
+
 
-
-
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 
 
 
@@ -42,8 +25,9 @@
 
 
 
-
+
 
+
 
 
 
@@ -54,23 +38,21 @@
 
 
 
-
-
-
-
-
-
-
+
+
+
+
+
+
 
 
+
+
+
+
 
-
-
-
-https://bridges.torproject.org/?lang=nb";>
-
-
-https://www.riseup.net, 
https://mail.google.com, eller https://mail.yahoo.com";>
-
-
+
+
+
+
+

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


[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2017-11-13 Thread translation
commit 32ad21dd8e3770f5035f6ab71057bf57cfd9c3f9
Author: Translation commit bot 
Date:   Tue Nov 14 02:16:53 2017 +

Update translations for tor-launcher-network-settings
---
 nb/network-settings.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd
index 2b0df8d95..3efa448f3 100644
--- a/nb/network-settings.dtd
+++ b/nb/network-settings.dtd
@@ -43,7 +43,7 @@
 
 
 
-
+
 
 
 
@@ -51,8 +51,8 @@
 
 
 
-
-
+
+
 
 
-
+

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


[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2017-11-13 Thread translation
commit 8cd12e1c44d80ce1e34f56d9269fe85670799152
Author: Translation commit bot 
Date:   Tue Nov 14 01:46:54 2017 +

Update translations for tor-launcher-network-settings
---
 nb/network-settings.dtd | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd
index 0294ffa79..2b0df8d95 100644
--- a/nb/network-settings.dtd
+++ b/nb/network-settings.dtd
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
@@ -10,7 +10,7 @@
 
 
 
-
+
 
 
 
@@ -25,7 +25,7 @@
 
 
 
-
+
 
 
 
@@ -48,7 +48,7 @@
 
 
 
-
+
 
 
 

___
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.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-11-13 Thread nickm
commit 50fbede4597d143411b3739e88d2c3d8ef457fbd
Merge: fea5c8a01 1b9bb2c84
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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.0

2017-11-13 Thread nickm
commit 50fbede4597d143411b3739e88d2c3d8ef457fbd
Merge: fea5c8a01 1b9bb2c84
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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.0' into maint-0.3.1

2017-11-13 Thread nickm
commit 1d5e693b63bffe06cb69932176eb0ac4ea4decbd
Merge: 562b3c967 50fbede45
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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

2017-11-13 Thread nickm
commit 3c0150aa46658366bcfe2e65ed53d6a075d42698
Merge: 70fcbd5f8 1d5e693b6
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

___
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 'bug22895_027' into maint-0.2.9

2017-11-13 Thread nickm
commit 1b9bb2c847a97a50f519ee12df56b6dcdfe6686c
Merge: 543fd89fb 89c0a00a9
Author: Nick Mathewson 
Date:   Mon Nov 13 20:35:59 2017 -0500

Merge branch 'bug22895_027' into maint-0.2.9

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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.0] Merge branch 'bug22895_027' into maint-0.2.9

2017-11-13 Thread nickm
commit 1b9bb2c847a97a50f519ee12df56b6dcdfe6686c
Merge: 543fd89fb 89c0a00a9
Author: Nick Mathewson 
Date:   Mon Nov 13 20:35:59 2017 -0500

Merge branch 'bug22895_027' into maint-0.2.9

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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.0] Remove unused variables in donna's SSE2 code

2017-11-13 Thread nickm
commit 89c0a00a9ac12082970d4e5752d4392fd03c95f3
Author: cypherpunks 
Date:   Wed Jul 12 16:33:01 2017 +

Remove unused variables in donna's SSE2 code

Fixes unused-const-variable warnings with GCC on 32-bit x86 systems.

Closes #22895.
---
 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/changes/ticket22895 b/changes/ticket22895
new file mode 100644
index 0..a3f7b8601
--- /dev/null
+++ b/changes/ticket22895
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Fix unused variable warnings in donna's Curve25519 SSE2 code.
+  Fixes bug 22895; bugfix on 0.2.7.2-alpha.
diff --git a/src/ext/ed25519/donna/curve25519-donna-sse2.h 
b/src/ext/ed25519/donna/curve25519-donna-sse2.h
index 1dbfd44d8..1123cb1e9 100644
--- a/src/ext/ed25519/donna/curve25519-donna-sse2.h
+++ b/src/ext/ed25519/donna/curve25519-donna-sse2.h
@@ -29,26 +29,19 @@ typedef packedelem32 packed32bignum25519[5];
 typedef packedelem64 packed64bignum25519[10];
 
 static const packedelem32 bot32bitmask = {{0x, 0x, 0x, 
0x}};
-static const packedelem32 top32bitmask = {{0x, 0x, 0x, 
0x}};
 static const packedelem32 top64bitmask = {{0x, 0x, 0x, 
0x}};
 static const packedelem32 bot64bitmask = {{0x, 0x, 0x, 
0x}};
 
 /* reduction masks */
 static const packedelem64 packedmask26 = {{0x03ff, 0x03ff}};
 static const packedelem64 packedmask25 = {{0x01ff, 0x01ff}};
-static const packedelem32 packedmask2625 = {{0x3ff,0,0x1ff,0}};
 static const packedelem32 packedmask26262626 = {{0x03ff, 0x03ff, 
0x03ff, 0x03ff}};
 static const packedelem32 packedmask25252525 = {{0x01ff, 0x01ff, 
0x01ff, 0x01ff}};
 
 /* multipliers */
 static const packedelem64 packednineteen = {{19, 19}};
-static const packedelem64 packednineteenone = {{19, 1}};
 static const packedelem64 packedthirtyeight = {{38, 38}};
 static const packedelem64 packed3819 = {{19*2,19}};
-static const packedelem64 packed9638 = {{19*4,19*2}};
-
-/* 121666,121665 */
-static const packedelem64 packed121666121665 = {{121666, 121665}};
 
 /* 2*(2^255 - 19) = 0 mod p */
 static const packedelem32 packed2p0 = 
{{0x7da,0x3fe,0x7fe,0x3fe}};



___
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.0' into maint-0.3.1

2017-11-13 Thread nickm
commit 1d5e693b63bffe06cb69932176eb0ac4ea4decbd
Merge: 562b3c967 50fbede45
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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] Remove unused variables in donna's SSE2 code

2017-11-13 Thread nickm
commit 89c0a00a9ac12082970d4e5752d4392fd03c95f3
Author: cypherpunks 
Date:   Wed Jul 12 16:33:01 2017 +

Remove unused variables in donna's SSE2 code

Fixes unused-const-variable warnings with GCC on 32-bit x86 systems.

Closes #22895.
---
 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/changes/ticket22895 b/changes/ticket22895
new file mode 100644
index 0..a3f7b8601
--- /dev/null
+++ b/changes/ticket22895
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Fix unused variable warnings in donna's Curve25519 SSE2 code.
+  Fixes bug 22895; bugfix on 0.2.7.2-alpha.
diff --git a/src/ext/ed25519/donna/curve25519-donna-sse2.h 
b/src/ext/ed25519/donna/curve25519-donna-sse2.h
index 1dbfd44d8..1123cb1e9 100644
--- a/src/ext/ed25519/donna/curve25519-donna-sse2.h
+++ b/src/ext/ed25519/donna/curve25519-donna-sse2.h
@@ -29,26 +29,19 @@ typedef packedelem32 packed32bignum25519[5];
 typedef packedelem64 packed64bignum25519[10];
 
 static const packedelem32 bot32bitmask = {{0x, 0x, 0x, 
0x}};
-static const packedelem32 top32bitmask = {{0x, 0x, 0x, 
0x}};
 static const packedelem32 top64bitmask = {{0x, 0x, 0x, 
0x}};
 static const packedelem32 bot64bitmask = {{0x, 0x, 0x, 
0x}};
 
 /* reduction masks */
 static const packedelem64 packedmask26 = {{0x03ff, 0x03ff}};
 static const packedelem64 packedmask25 = {{0x01ff, 0x01ff}};
-static const packedelem32 packedmask2625 = {{0x3ff,0,0x1ff,0}};
 static const packedelem32 packedmask26262626 = {{0x03ff, 0x03ff, 
0x03ff, 0x03ff}};
 static const packedelem32 packedmask25252525 = {{0x01ff, 0x01ff, 
0x01ff, 0x01ff}};
 
 /* multipliers */
 static const packedelem64 packednineteen = {{19, 19}};
-static const packedelem64 packednineteenone = {{19, 1}};
 static const packedelem64 packedthirtyeight = {{38, 38}};
 static const packedelem64 packed3819 = {{19*2,19}};
-static const packedelem64 packed9638 = {{19*4,19*2}};
-
-/* 121666,121665 */
-static const packedelem64 packed121666121665 = {{121666, 121665}};
 
 /* 2*(2^255 - 19) = 0 mod p */
 static const packedelem32 packed2p0 = 
{{0x7da,0x3fe,0x7fe,0x3fe}};



___
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

2017-11-13 Thread nickm
commit 6059784be0b022adbe274035acc920381ca3fef0
Merge: 985c41b50 1d5e693b6
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2




___
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 'bug22895_027' into maint-0.2.9

2017-11-13 Thread nickm
commit 1b9bb2c847a97a50f519ee12df56b6dcdfe6686c
Merge: 543fd89fb 89c0a00a9
Author: Nick Mathewson 
Date:   Mon Nov 13 20:35:59 2017 -0500

Merge branch 'bug22895_027' into maint-0.2.9

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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'

2017-11-13 Thread nickm
commit fe04a19cb794be9cbdbe09b6792799f010b108c7
Merge: 5a9b0374a 6059784be
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.2'

___
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.0

2017-11-13 Thread nickm
commit 50fbede4597d143411b3739e88d2c3d8ef457fbd
Merge: fea5c8a01 1b9bb2c84
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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.0] Merge branch 'maint-0.3.0' into release-0.3.0

2017-11-13 Thread nickm
commit 7b93939c773e62f2dabf73011b470d1a57d96efd
Merge: fa3cad363 50fbede45
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

___
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.0

2017-11-13 Thread nickm
commit 50fbede4597d143411b3739e88d2c3d8ef457fbd
Merge: fea5c8a01 1b9bb2c84
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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

2017-11-13 Thread nickm
commit 349a92bf3f57ae3d5f8cdfa09570bfc6e6577a89
Merge: 8473424ed 6059784be
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

___
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] Remove unused variables in donna's SSE2 code

2017-11-13 Thread nickm
commit 89c0a00a9ac12082970d4e5752d4392fd03c95f3
Author: cypherpunks 
Date:   Wed Jul 12 16:33:01 2017 +

Remove unused variables in donna's SSE2 code

Fixes unused-const-variable warnings with GCC on 32-bit x86 systems.

Closes #22895.
---
 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/changes/ticket22895 b/changes/ticket22895
new file mode 100644
index 0..a3f7b8601
--- /dev/null
+++ b/changes/ticket22895
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Fix unused variable warnings in donna's Curve25519 SSE2 code.
+  Fixes bug 22895; bugfix on 0.2.7.2-alpha.
diff --git a/src/ext/ed25519/donna/curve25519-donna-sse2.h 
b/src/ext/ed25519/donna/curve25519-donna-sse2.h
index 1dbfd44d8..1123cb1e9 100644
--- a/src/ext/ed25519/donna/curve25519-donna-sse2.h
+++ b/src/ext/ed25519/donna/curve25519-donna-sse2.h
@@ -29,26 +29,19 @@ typedef packedelem32 packed32bignum25519[5];
 typedef packedelem64 packed64bignum25519[10];
 
 static const packedelem32 bot32bitmask = {{0x, 0x, 0x, 
0x}};
-static const packedelem32 top32bitmask = {{0x, 0x, 0x, 
0x}};
 static const packedelem32 top64bitmask = {{0x, 0x, 0x, 
0x}};
 static const packedelem32 bot64bitmask = {{0x, 0x, 0x, 
0x}};
 
 /* reduction masks */
 static const packedelem64 packedmask26 = {{0x03ff, 0x03ff}};
 static const packedelem64 packedmask25 = {{0x01ff, 0x01ff}};
-static const packedelem32 packedmask2625 = {{0x3ff,0,0x1ff,0}};
 static const packedelem32 packedmask26262626 = {{0x03ff, 0x03ff, 
0x03ff, 0x03ff}};
 static const packedelem32 packedmask25252525 = {{0x01ff, 0x01ff, 
0x01ff, 0x01ff}};
 
 /* multipliers */
 static const packedelem64 packednineteen = {{19, 19}};
-static const packedelem64 packednineteenone = {{19, 1}};
 static const packedelem64 packedthirtyeight = {{38, 38}};
 static const packedelem64 packed3819 = {{19*2,19}};
-static const packedelem64 packed9638 = {{19*4,19*2}};
-
-/* 121666,121665 */
-static const packedelem64 packed121666121665 = {{121666, 121665}};
 
 /* 2*(2^255 - 19) = 0 mod p */
 static const packedelem32 packed2p0 = 
{{0x7da,0x3fe,0x7fe,0x3fe}};



___
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.0] Remove unused variables in donna's SSE2 code

2017-11-13 Thread nickm
commit 89c0a00a9ac12082970d4e5752d4392fd03c95f3
Author: cypherpunks 
Date:   Wed Jul 12 16:33:01 2017 +

Remove unused variables in donna's SSE2 code

Fixes unused-const-variable warnings with GCC on 32-bit x86 systems.

Closes #22895.
---
 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/changes/ticket22895 b/changes/ticket22895
new file mode 100644
index 0..a3f7b8601
--- /dev/null
+++ b/changes/ticket22895
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Fix unused variable warnings in donna's Curve25519 SSE2 code.
+  Fixes bug 22895; bugfix on 0.2.7.2-alpha.
diff --git a/src/ext/ed25519/donna/curve25519-donna-sse2.h 
b/src/ext/ed25519/donna/curve25519-donna-sse2.h
index 1dbfd44d8..1123cb1e9 100644
--- a/src/ext/ed25519/donna/curve25519-donna-sse2.h
+++ b/src/ext/ed25519/donna/curve25519-donna-sse2.h
@@ -29,26 +29,19 @@ typedef packedelem32 packed32bignum25519[5];
 typedef packedelem64 packed64bignum25519[10];
 
 static const packedelem32 bot32bitmask = {{0x, 0x, 0x, 
0x}};
-static const packedelem32 top32bitmask = {{0x, 0x, 0x, 
0x}};
 static const packedelem32 top64bitmask = {{0x, 0x, 0x, 
0x}};
 static const packedelem32 bot64bitmask = {{0x, 0x, 0x, 
0x}};
 
 /* reduction masks */
 static const packedelem64 packedmask26 = {{0x03ff, 0x03ff}};
 static const packedelem64 packedmask25 = {{0x01ff, 0x01ff}};
-static const packedelem32 packedmask2625 = {{0x3ff,0,0x1ff,0}};
 static const packedelem32 packedmask26262626 = {{0x03ff, 0x03ff, 
0x03ff, 0x03ff}};
 static const packedelem32 packedmask25252525 = {{0x01ff, 0x01ff, 
0x01ff, 0x01ff}};
 
 /* multipliers */
 static const packedelem64 packednineteen = {{19, 19}};
-static const packedelem64 packednineteenone = {{19, 1}};
 static const packedelem64 packedthirtyeight = {{38, 38}};
 static const packedelem64 packed3819 = {{19*2,19}};
-static const packedelem64 packed9638 = {{19*4,19*2}};
-
-/* 121666,121665 */
-static const packedelem64 packed121666121665 = {{121666, 121665}};
 
 /* 2*(2^255 - 19) = 0 mod p */
 static const packedelem32 packed2p0 = 
{{0x7da,0x3fe,0x7fe,0x3fe}};



___
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 'bug22895_027' into maint-0.2.9

2017-11-13 Thread nickm
commit 1b9bb2c847a97a50f519ee12df56b6dcdfe6686c
Merge: 543fd89fb 89c0a00a9
Author: Nick Mathewson 
Date:   Mon Nov 13 20:35:59 2017 -0500

Merge branch 'bug22895_027' into maint-0.2.9

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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

2017-11-13 Thread nickm
commit 6059784be0b022adbe274035acc920381ca3fef0
Merge: 985c41b50 1d5e693b6
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2




___
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

2017-11-13 Thread nickm
commit b84815881f92a0a301a0e7b54fcc685b950a6845
Merge: dbb9ec494 1b9bb2c84
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

___
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.0' into maint-0.3.1

2017-11-13 Thread nickm
commit 1d5e693b63bffe06cb69932176eb0ac4ea4decbd
Merge: 562b3c967 50fbede45
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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.3.0' into maint-0.3.1

2017-11-13 Thread nickm
commit 1d5e693b63bffe06cb69932176eb0ac4ea4decbd
Merge: 562b3c967 50fbede45
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

___
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 'bug22895_027' into maint-0.2.9

2017-11-13 Thread nickm
commit 1b9bb2c847a97a50f519ee12df56b6dcdfe6686c
Merge: 543fd89fb 89c0a00a9
Author: Nick Mathewson 
Date:   Mon Nov 13 20:35:59 2017 -0500

Merge branch 'bug22895_027' into maint-0.2.9

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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] Remove unused variables in donna's SSE2 code

2017-11-13 Thread nickm
commit 89c0a00a9ac12082970d4e5752d4392fd03c95f3
Author: cypherpunks 
Date:   Wed Jul 12 16:33:01 2017 +

Remove unused variables in donna's SSE2 code

Fixes unused-const-variable warnings with GCC on 32-bit x86 systems.

Closes #22895.
---
 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/changes/ticket22895 b/changes/ticket22895
new file mode 100644
index 0..a3f7b8601
--- /dev/null
+++ b/changes/ticket22895
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Fix unused variable warnings in donna's Curve25519 SSE2 code.
+  Fixes bug 22895; bugfix on 0.2.7.2-alpha.
diff --git a/src/ext/ed25519/donna/curve25519-donna-sse2.h 
b/src/ext/ed25519/donna/curve25519-donna-sse2.h
index 1dbfd44d8..1123cb1e9 100644
--- a/src/ext/ed25519/donna/curve25519-donna-sse2.h
+++ b/src/ext/ed25519/donna/curve25519-donna-sse2.h
@@ -29,26 +29,19 @@ typedef packedelem32 packed32bignum25519[5];
 typedef packedelem64 packed64bignum25519[10];
 
 static const packedelem32 bot32bitmask = {{0x, 0x, 0x, 
0x}};
-static const packedelem32 top32bitmask = {{0x, 0x, 0x, 
0x}};
 static const packedelem32 top64bitmask = {{0x, 0x, 0x, 
0x}};
 static const packedelem32 bot64bitmask = {{0x, 0x, 0x, 
0x}};
 
 /* reduction masks */
 static const packedelem64 packedmask26 = {{0x03ff, 0x03ff}};
 static const packedelem64 packedmask25 = {{0x01ff, 0x01ff}};
-static const packedelem32 packedmask2625 = {{0x3ff,0,0x1ff,0}};
 static const packedelem32 packedmask26262626 = {{0x03ff, 0x03ff, 
0x03ff, 0x03ff}};
 static const packedelem32 packedmask25252525 = {{0x01ff, 0x01ff, 
0x01ff, 0x01ff}};
 
 /* multipliers */
 static const packedelem64 packednineteen = {{19, 19}};
-static const packedelem64 packednineteenone = {{19, 1}};
 static const packedelem64 packedthirtyeight = {{38, 38}};
 static const packedelem64 packed3819 = {{19*2,19}};
-static const packedelem64 packed9638 = {{19*4,19*2}};
-
-/* 121666,121665 */
-static const packedelem64 packed121666121665 = {{121666, 121665}};
 
 /* 2*(2^255 - 19) = 0 mod p */
 static const packedelem32 packed2p0 = 
{{0x7da,0x3fe,0x7fe,0x3fe}};



___
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.0

2017-11-13 Thread nickm
commit 50fbede4597d143411b3739e88d2c3d8ef457fbd
Merge: fea5c8a01 1b9bb2c84
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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

2017-11-13 Thread nickm
commit 6059784be0b022adbe274035acc920381ca3fef0
Merge: 985c41b50 1d5e693b6
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

___
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.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-11-13 Thread nickm
commit 50fbede4597d143411b3739e88d2c3d8ef457fbd
Merge: fea5c8a01 1b9bb2c84
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

___
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] Remove unused variables in donna's SSE2 code

2017-11-13 Thread nickm
commit 89c0a00a9ac12082970d4e5752d4392fd03c95f3
Author: cypherpunks 
Date:   Wed Jul 12 16:33:01 2017 +

Remove unused variables in donna's SSE2 code

Fixes unused-const-variable warnings with GCC on 32-bit x86 systems.

Closes #22895.
---
 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/changes/ticket22895 b/changes/ticket22895
new file mode 100644
index 0..a3f7b8601
--- /dev/null
+++ b/changes/ticket22895
@@ -0,0 +1,3 @@
+  o Minor bugfixes (compilation):
+- Fix unused variable warnings in donna's Curve25519 SSE2 code.
+  Fixes bug 22895; bugfix on 0.2.7.2-alpha.
diff --git a/src/ext/ed25519/donna/curve25519-donna-sse2.h 
b/src/ext/ed25519/donna/curve25519-donna-sse2.h
index 1dbfd44d8..1123cb1e9 100644
--- a/src/ext/ed25519/donna/curve25519-donna-sse2.h
+++ b/src/ext/ed25519/donna/curve25519-donna-sse2.h
@@ -29,26 +29,19 @@ typedef packedelem32 packed32bignum25519[5];
 typedef packedelem64 packed64bignum25519[10];
 
 static const packedelem32 bot32bitmask = {{0x, 0x, 0x, 
0x}};
-static const packedelem32 top32bitmask = {{0x, 0x, 0x, 
0x}};
 static const packedelem32 top64bitmask = {{0x, 0x, 0x, 
0x}};
 static const packedelem32 bot64bitmask = {{0x, 0x, 0x, 
0x}};
 
 /* reduction masks */
 static const packedelem64 packedmask26 = {{0x03ff, 0x03ff}};
 static const packedelem64 packedmask25 = {{0x01ff, 0x01ff}};
-static const packedelem32 packedmask2625 = {{0x3ff,0,0x1ff,0}};
 static const packedelem32 packedmask26262626 = {{0x03ff, 0x03ff, 
0x03ff, 0x03ff}};
 static const packedelem32 packedmask25252525 = {{0x01ff, 0x01ff, 
0x01ff, 0x01ff}};
 
 /* multipliers */
 static const packedelem64 packednineteen = {{19, 19}};
-static const packedelem64 packednineteenone = {{19, 1}};
 static const packedelem64 packedthirtyeight = {{38, 38}};
 static const packedelem64 packed3819 = {{19*2,19}};
-static const packedelem64 packed9638 = {{19*4,19*2}};
-
-/* 121666,121665 */
-static const packedelem64 packed121666121665 = {{121666, 121665}};
 
 /* 2*(2^255 - 19) = 0 mod p */
 static const packedelem32 packed2p0 = 
{{0x7da,0x3fe,0x7fe,0x3fe}};



___
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.0] Merge branch 'bug22895_027' into maint-0.2.9

2017-11-13 Thread nickm
commit 1b9bb2c847a97a50f519ee12df56b6dcdfe6686c
Merge: 543fd89fb 89c0a00a9
Author: Nick Mathewson 
Date:   Mon Nov 13 20:35:59 2017 -0500

Merge branch 'bug22895_027' into maint-0.2.9

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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 'bug22895_027' into maint-0.2.9

2017-11-13 Thread nickm
commit 1b9bb2c847a97a50f519ee12df56b6dcdfe6686c
Merge: 543fd89fb 89c0a00a9
Author: Nick Mathewson 
Date:   Mon Nov 13 20:35:59 2017 -0500

Merge branch 'bug22895_027' into maint-0.2.9

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

___
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.0

2017-11-13 Thread nickm
commit 50fbede4597d143411b3739e88d2c3d8ef457fbd
Merge: fea5c8a01 1b9bb2c84
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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.0' into maint-0.3.1

2017-11-13 Thread nickm
commit 1d5e693b63bffe06cb69932176eb0ac4ea4decbd
Merge: 562b3c967 50fbede45
Author: Nick Mathewson 
Date:   Mon Nov 13 20:36:04 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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 'bug22895_027' into maint-0.2.9

2017-11-13 Thread nickm
commit 1b9bb2c847a97a50f519ee12df56b6dcdfe6686c
Merge: 543fd89fb 89c0a00a9
Author: Nick Mathewson 
Date:   Mon Nov 13 20:35:59 2017 -0500

Merge branch 'bug22895_027' into maint-0.2.9

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



___
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 'bug22895_027' into maint-0.2.9

2017-11-13 Thread nickm
commit 1b9bb2c847a97a50f519ee12df56b6dcdfe6686c
Merge: 543fd89fb 89c0a00a9
Author: Nick Mathewson 
Date:   Mon Nov 13 20:35:59 2017 -0500

Merge branch 'bug22895_027' into maint-0.2.9

 changes/ticket22895   | 3 +++
 src/ext/ed25519/donna/curve25519-donna-sse2.h | 7 ---
 2 files changed, 3 insertions(+), 7 deletions(-)



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


[tor-commits] [translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings

2017-11-13 Thread translation
commit 3ff2ab729c9225dca9f253b6f86da642ab583078
Author: Translation commit bot 
Date:   Tue Nov 14 01:17:03 2017 +

Update translations for tor-launcher-network-settings
---
 nb/network-settings.dtd | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nb/network-settings.dtd b/nb/network-settings.dtd
index 2824aa648..0294ffa79 100644
--- a/nb/network-settings.dtd
+++ b/nb/network-settings.dtd
@@ -1,7 +1,7 @@
 
-
+
 
-
+
 
 
 
@@ -9,7 +9,7 @@
 
 
 
-
+
 
 
 
@@ -27,7 +27,7 @@
 
 
 
-
+
 
 
 
@@ -38,16 +38,16 @@
 
 
 
-
-
-
-
-
+
+
+
+
+
 
 
 
 
-
+
 
 
 

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


[tor-commits] [translation/tor-launcher-properties_completed] Update translations for tor-launcher-properties_completed

2017-11-13 Thread translation
commit db0bf69640a1242cd7a364855bf46a2b3b4e5940
Author: Translation commit bot 
Date:   Tue Nov 14 01:16:47 2017 +

Update translations for tor-launcher-properties_completed
---
 nb/torlauncher.properties | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nb/torlauncher.properties b/nb/torlauncher.properties
index 0bb82b1b0..acde34bc7 100644
--- a/nb/torlauncher.properties
+++ b/nb/torlauncher.properties
@@ -23,12 +23,13 @@ torlauncher.failed_to_save_settings=Kunne ikke lagre 
Tor-innstillinger.\n\n%S
 torlauncher.ensure_tor_is_running=Sjekk at Tor kjører.
 
 torlauncher.error_proxy_addr_missing=Du må spesifisere både IP-adresse eller 
vertsnavn og et portnummer for å sette opp Tor til bruk med en mellomtjener 
for å koble til Internett.
-torlauncher.error_proxy_type_missing=Du må velge melomtjenertypen
+torlauncher.error_proxy_type_missing=Du må velge mellomtjenertypen.
 torlauncher.error_bridges_missing=Du må velge én eller flere broer.
 torlauncher.error_default_bridges_type_missing=Du må velge en tilkoblingstype 
for de angitte broene.
 torlauncher.error_bridge_bad_default_type=Det er ingen angitte broer som har 
tilkoblingstypen %S tilgjengelig. Juster innstillingene dine.
 
-torlauncher.recommended_bridge=(anbefalt)
+torlauncher.bridge_suffix.meek-amazon=(virker i Kina)
+torlauncher.bridge_suffix.meek-azure=(virker i Kina)
 
 torlauncher.connect=Koble til
 torlauncher.restart_tor=Omstart av Tor

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


[tor-commits] [translation/tor-launcher-properties] Update translations for tor-launcher-properties

2017-11-13 Thread translation
commit 68837e4bdd9a33a51d43a9016689822e944e8d56
Author: Translation commit bot 
Date:   Tue Nov 14 01:16:40 2017 +

Update translations for tor-launcher-properties
---
 nb/torlauncher.properties | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nb/torlauncher.properties b/nb/torlauncher.properties
index adefc26ed..acde34bc7 100644
--- a/nb/torlauncher.properties
+++ b/nb/torlauncher.properties
@@ -23,13 +23,13 @@ torlauncher.failed_to_save_settings=Kunne ikke lagre 
Tor-innstillinger.\n\n%S
 torlauncher.ensure_tor_is_running=Sjekk at Tor kjører.
 
 torlauncher.error_proxy_addr_missing=Du må spesifisere både IP-adresse eller 
vertsnavn og et portnummer for å sette opp Tor til bruk med en mellomtjener 
for å koble til Internett.
-torlauncher.error_proxy_type_missing=Du må velge melomtjenertypen
+torlauncher.error_proxy_type_missing=Du må velge mellomtjenertypen.
 torlauncher.error_bridges_missing=Du må velge én eller flere broer.
 torlauncher.error_default_bridges_type_missing=Du må velge en tilkoblingstype 
for de angitte broene.
 torlauncher.error_bridge_bad_default_type=Det er ingen angitte broer som har 
tilkoblingstypen %S tilgjengelig. Juster innstillingene dine.
 
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+torlauncher.bridge_suffix.meek-amazon=(virker i Kina)
+torlauncher.bridge_suffix.meek-azure=(virker i Kina)
 
 torlauncher.connect=Koble til
 torlauncher.restart_tor=Omstart av Tor

___
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 missing subcategory to 23637, again

2017-11-13 Thread nickm
commit 985c41b5003ccfd2f953b25a9b48afb4a2898234
Author: Nick Mathewson 
Date:   Mon Nov 13 16:58:11 2017 -0500

add a missing subcategory to 23637, again
---
 changes/ticket23637 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/ticket23637 b/changes/ticket23637
index 8687ab1a0..0c524f34c 100644
--- a/changes/ticket23637
+++ b/changes/ticket23637
@@ -1,4 +1,4 @@
-  o Minor features:
+  o Minor features (directory authority):
 - Make the "Exit" flag assignment only depend on whether the exit
   policy allows connections to ports 80 and 443. Previously relays
   would get the Exit flag if they allowed connections to one of



___
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 missing subcategory to 23637, again

2017-11-13 Thread nickm
commit 985c41b5003ccfd2f953b25a9b48afb4a2898234
Author: Nick Mathewson 
Date:   Mon Nov 13 16:58:11 2017 -0500

add a missing subcategory to 23637, again
---
 changes/ticket23637 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/ticket23637 b/changes/ticket23637
index 8687ab1a0..0c524f34c 100644
--- a/changes/ticket23637
+++ b/changes/ticket23637
@@ -1,4 +1,4 @@
-  o Minor features:
+  o Minor features (directory authority):
 - Make the "Exit" flag assignment only depend on whether the exit
   policy allows connections to ports 80 and 443. Previously relays
   would get the Exit flag if they allowed connections to one of

___
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 missing subcategory to 23637, again

2017-11-13 Thread nickm
commit 985c41b5003ccfd2f953b25a9b48afb4a2898234
Author: Nick Mathewson 
Date:   Mon Nov 13 16:58:11 2017 -0500

add a missing subcategory to 23637, again
---
 changes/ticket23637 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/ticket23637 b/changes/ticket23637
index 8687ab1a0..0c524f34c 100644
--- a/changes/ticket23637
+++ b/changes/ticket23637
@@ -1,4 +1,4 @@
-  o Minor features:
+  o Minor features (directory authority):
 - Make the "Exit" flag assignment only depend on whether the exit
   policy allows connections to ports 80 and 443. Previously relays
   would get the Exit flag if they allowed connections to one of



___
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

2017-11-13 Thread nickm
commit 8473424ede44053f3986330b5f80c36ff12e3162
Merge: ab8013391 985c41b50
Author: Nick Mathewson 
Date:   Mon Nov 13 16:58:21 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

 changes/ticket23637 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
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'

2017-11-13 Thread nickm
commit 5a9b0374a0cacc5bd8424efaae6e3139419818e8
Merge: a5a87c1d9 985c41b50
Author: Nick Mathewson 
Date:   Mon Nov 13 16:58:21 2017 -0500

Merge branch 'maint-0.3.2'

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


[tor-commits] [webwml/master] Add Antonela to people page

2017-11-13 Thread atagar
commit fdf5027f78f1ef2615293b6c27c56f67aef99ec7
Author: Damian Johnson 
Date:   Mon Nov 13 11:19:01 2017 -0800

Add Antonela to people page
---
 about/en/corepeople.wml  | 156 +--
 images/people/antonela.png   | Bin 0 -> 23267 bytes
 images/people/orig/antonela.jpeg | Bin 0 -> 12110 bytes
 keys/antonela.txt|  52 +
 4 files changed, 136 insertions(+), 72 deletions(-)

diff --git a/about/en/corepeople.wml b/about/en/corepeople.wml
index 29b0ed4f..c6358575 100644
--- a/about/en/corepeople.wml
+++ b/about/en/corepeople.wml
@@ -108,6 +108,18 @@ table.people tr td:first-child {
 
 
 
+  
+  
+  https://twitter.com/holantonela";>
+  
+  Antonela Debiasi
+  IRC: antonela
+  Designer working with the UX team. Making Tor 
usable for everyone.
+
+  
+
+  
+
   
   
   https://twitter.com/arlolra";>
@@ -116,9 +128,7 @@ table.people tr td:first-child {
   IRC: arlolra
   Developer for Snowflake, Tor Messenger, and 
Check.
 
-  
 
-  
 
   
   
@@ -127,7 +137,9 @@ table.people tr td:first-child {
   IRC: arthuredelstein
   Works on Tor Browser.
 
+  
 
+  
 
   
   
@@ -137,9 +149,7 @@ table.people tr td:first-child {
   IRC: hellais
   Project leader for https://ooni.torproject.org/";>OONI, has helped with http://tor2web.org/";>tor2web, wrote https://atlas.torproject.org/";>Atlas, and helps improve 
security.
 
-  
 
-  
 
   
   
@@ -148,7 +158,9 @@ table.people tr td:first-child {
   IRC: bparker
   Chief financial & grants officer at the Tor 
Project.
 
+  
 
+  
 
   
   
@@ -157,9 +169,7 @@ table.people tr td:first-child {
   IRC: brade
   Developer on the Tor Browser team.
 
-  
 
-  
 
   
   
@@ -169,7 +179,9 @@ table.people tr td:first-child {
   IRC: komlo
   Chelsea is a software/security engineer and 
contributes to core tor.
 
+  
 
+  
 
   
   
@@ -177,9 +189,7 @@ table.people tr td:first-child {
   Cindy Cohn
   Tor Board member and https://www.eff.org/about/staff/cindy-cohn";>Executive Director of the 
EFF. Lawyer by training, https://blog.torproject.org/blog/tor-heart-notes-board-member";>my 
focus is on making sure Tor stays available and that Tor users stay 
safe.
 
-  
 
-  
 
   
   
@@ -189,7 +199,9 @@ table.people tr td:first-child {
   IRC: Phoul
   Support and translation coordinator, GSoC 
administrator, member of the community team and a director of https://www.coldhak.ca";>Coldhak.
 
+  
 
+  
 
   
   
@@ -198,9 +210,7 @@ table.people tr td:first-child {
   IRC: atagar
   Author of the https://stem.torproject.org/";>Stem python controller library and https://nyx.torproject.org/";>Nyx relay monitor.
 
-  
 
-  
 
   
   
@@ -209,7 +219,9 @@ table.people tr td:first-child {
   IRC: dgoulet
   Tor development team focusing on onion services 
and our torsocks maintainer.
 
+  
 
+  
 
   
   
@@ -219,9 +231,7 @@ table.people tr td:first-child {
   IRC: dawuud
   https://github.com/david415/";>Author 
of roflcoptor and honeybadger. Researches mixnets and contributes to 
txtorcon.
 
-  
 
-  
 
   
   
@@ -231,7 +241,9 @@ table.people tr td:first-child {
   IRC: DonnchaC
   Onion services developer, OnionBalance 
developer, hunter of bad relays.
 
+  
 
+  
 
   
   
@@ -240,9 +252,7 @@ table.people tr td:first-child {
   IRC: ewyatt
   Non-technical switchboard for people-related 
things: recruiting, onboarding, benefits, contracts, TPI policy questions, and 
baked goods.
 
-  
 
-  
 
   
   
@@ -252,7 +262,9 @@ table.people tr td:first-child {
   IRC: biella
   http://gabriellacoleman.org/";>Anthropologist and Wolfe Chair in 
Scientific and Technological Literacy at McGill University.
 
+  
 
+  
 
   
   
@@ -260,9 +272,7 @@ table.people tr td:first-child {
   IRC: gman999
   Tor BSD Diversity Project member, long-time 
relay operator, trainer.
 
-  
 
-  
 
   
   
@@ -271,7 +281,9 @@ table.people tr td:first-child {
   IRC: GeKo
   Currently lead of the Tor Browser team.
 
+  
 
+  
 
   
   
@@ -280,9 +292,7 @@ table.people tr td:first-child {
   IRC: asn
   Onion services. Security analysis. Used to 
obfsproxy. Follower of the onion.
 
-  
 
-  
 
   
   
@@ -292,7 +302,9 @@ table.people tr td:first-child {
   IRC: saint
   Tamper-resistant software distribution, 
censorship detection, https://github.com/glamrock/cupcake";>Cupcake, and security training 
of activists and domestic violence survivors.
 
+  
 
+  
 
   
   
@@ -302,9 +314,7 @@ table.people tr td:first-child {
   IRC: irl
   https://metrics.torproject.org";>Me

[tor-commits] [torspec/master] proposal 285: utf-8 all the things

2017-11-13 Thread nickm
commit 5ba8d5a7d08c09ae9949f20eb0633fc381c2dbc6
Author: Nick Mathewson 
Date:   Mon Nov 13 13:50:59 2017 -0500

proposal 285: utf-8 all the things
---
 proposals/000-index.txt |  2 ++
 proposals/285-utf-8.txt | 60 +
 2 files changed, 62 insertions(+)

diff --git a/proposals/000-index.txt b/proposals/000-index.txt
index 2ae06a9..3352d02 100644
--- a/proposals/000-index.txt
+++ b/proposals/000-index.txt
@@ -205,6 +205,7 @@ Proposals by number:
 282  Remove "Named" and "Unnamed" handling from consensus voting [OPEN]
 283  Move IPv6 ORPorts from microdescriptors to the microdesc consensus [OPEN]
 284  Hidden Service v3 Control Port [OPEN]
+285  Directory documents should be standardized as UTF-8 [OPEN]
 
 
 Proposals by status:
@@ -263,6 +264,7 @@ Proposals by status:
282  Remove "Named" and "Unnamed" handling from consensus voting [for 
0.3.3.x]
283  Move IPv6 ORPorts from microdescriptors to the microdesc consensus 
[for 0.3.3.x]
284  Hidden Service v3 Control Port
+   285  Directory documents should be standardized as UTF-8
  ACCEPTED:
172  GETINFO controller option for circuit information
173  GETINFO Option Expansion
diff --git a/proposals/285-utf-8.txt b/proposals/285-utf-8.txt
new file mode 100644
index 000..939399f
--- /dev/null
+++ b/proposals/285-utf-8.txt
@@ -0,0 +1,60 @@
+Filename: 285-utf-8.txt
+Title: Directory documents should be standardized as UTF-8
+Author: Nick Mathewson
+Created: 13 November 2017
+Status: Open
+
+1. Summary and motivation
+
+   People frequently want to include non-ASCII text in their router
+   descriptors.  The Contact line is a favorite place to do this, but in
+   principle the platform line would also be pretty logical.
+
+   Unfortunately, there's no specified way to encode non-ASCII in our
+   directory documents.
+
+   Fortunately, almost everybody who does it, uses UTF-8 anyway.
+
+   As we move towards Rust support in Tor, we gain another motivation
+   for standarding on UTF-8, since Rust's native strings strongly prefer
+   UTF-8.
+
+   So, in this proposal, we describe a migration path to having all
+   directory documents be fully UTF-8.
+
+2. Proposal
+
+   First, we should have Tor relays reject ContactInfo lines (and any
+   other lines copied directly into router descriptors) that are not
+   UTF-8.
+
+   At the same time, we should have authorities reject any router
+   descriptors or extrainfo documents that are not valid UTF-8.
+   Simultaneously, we can have all Tor instances reject all
+   non-directory-descriptor directory documents that are not UTF-8,
+   since none should exist today.
+
+   Finally, once the authorities have updated, we should have all Tor
+   instances reject all directory documents that are not UTF-8.  (We
+   should not take this step until the authorities have upgraded, or
+   else the behavior of updated and non-updated clients could be
+   distinguished.)
+
+2.1. Hidden service descriptors' encrypted bodies
+
+   For the encrypted bodies of hidden service descriptors, we cannot
+   reject them at the authority level, and so we need to take a slightly
+   different approach to prevent client fingerprinting attacks.
+
+   First, we should make Tor instances start warning about any hidden
+   service descriptors whose bodies, post-decryption, contain non-utf-8
+   plaintext.  At the same time, we add a consensus parameter to
+   indicate that hidden service descriptors with non-utf-8 plantexts
+   should be rejected entirely: "reject-encrypted-non-utf-8".  If that
+   parameter is set to 1, then hidden service clients will not only
+   warn, but reject the descriptors.
+
+   Once the vast majority of clients are running versions that support
+   the "reject-encrypted-non-utf-8" parameter, that parameter can be set
+   to 1.
+

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


[tor-commits] [nyx/master] Note geoip fix on changelog

2017-11-13 Thread atagar
commit 76b2e8d1bd5b77e42fd12e0c8067953847a22da4
Author: Damian Johnson 
Date:   Mon Nov 13 10:45:29 2017 -0800

Note geoip fix on changelog
---
 web/changelog/index.html | 8 
 1 file changed, 8 insertions(+)

diff --git a/web/changelog/index.html b/web/changelog/index.html
index a2df205..f597404 100644
--- a/web/changelog/index.html
+++ b/web/changelog/index.html
@@ -67,6 +67,14 @@
 
   The following are only available within Nyx's git 
repository.
 
+  
+Connections
+  
+Geoip information unavailable for inbound connections
+  
+
+  
+
   
   Version 2.0 (November 5th, 
2017)
 

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


[tor-commits] [nyx/master] Add Gentoo to download page

2017-11-13 Thread atagar
commit 10d56f8abf5d8d93ee11e64aa2f3769428d66105
Author: Damian Johnson 
Date:   Mon Nov 13 10:39:45 2017 -0800

Add Gentoo to download page
---
 web/index.html | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web/index.html b/web/index.html
index a273825..d904c1a 100644
--- a/web/index.html
+++ b/web/index.html
@@ -374,14 +374,14 @@ sudo python setup.py install
 Packages maintained by Juan for Fedora.
 % sudo yum install tor-arm
   
+  -->
 
   
-http://packages.gentoo.org/package/net-misc/arm"; 
id="gentoo">
-http://packages.gentoo.org/package/net-misc/arm"; 
class="platform-title">Gentoo
-Package maintained by Jesse for Gentoo.
-% sudo emerge arm
+https://packages.gentoo.org/packages/net-misc/nyx"; 
id="gentoo">
+https://packages.gentoo.org/packages/net-misc/nyx"; 
class="platform-title">Gentoo
+Package by Anthony Basile for Gentoo.
+% sudo emerge nyx
   
-  -->
 
   
 https://aur.archlinux.org/packages/nyx/"; id="archlinux">

___
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.8' into maint-0.2.9

2017-11-13 Thread nickm
commit 543fd89fb7fe4817b5e59beb132f5331ee7a2f48
Merge: ab415ae95 800797e7f
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
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.0] Merge branch 'bug23291_028' into maint-0.2.8

2017-11-13 Thread nickm
commit 800797e7f3c6cfacbf9655ef7d57ba96028a5c06
Merge: c9b76a12f b943cedf3
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:55 2017 -0500

Merge branch 'bug23291_028' into maint-0.2.8

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)



___
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 'bug23291_028' into maint-0.2.8

2017-11-13 Thread nickm
commit 800797e7f3c6cfacbf9655ef7d57ba96028a5c06
Merge: c9b76a12f b943cedf3
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:55 2017 -0500

Merge branch 'bug23291_028' into maint-0.2.8

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)



___
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

2017-11-13 Thread nickm
commit ab8013391ed7391739cb88efc10d22baeb7f10d3
Merge: 08d933a79 05ae99566
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

___
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 'bug23291_028' into maint-0.2.8

2017-11-13 Thread nickm
commit 800797e7f3c6cfacbf9655ef7d57ba96028a5c06
Merge: c9b76a12f b943cedf3
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:55 2017 -0500

Merge branch 'bug23291_028' into maint-0.2.8

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)



___
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.0] changes file for bug 23291

2017-11-13 Thread nickm
commit b943cedf3485d0d00c739e69fd2bb16d4e959867
Author: Nick Mathewson 
Date:   Mon Aug 21 15:04:35 2017 -0400

changes file for bug 23291
---
 changes/bug23291 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug23291 b/changes/bug23291
new file mode 100644
index 0..a5b0efda0
--- /dev/null
+++ b/changes/bug23291
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing):
+- Fix an undersized buffer in test-memwipe.c. Fixes bug 23291; bugfix on
+  0.2.7.2-alpha. Found and patched by Ties Stuij.



___
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.0' into maint-0.3.1

2017-11-13 Thread nickm
commit 562b3c96783628a57f60bb8adf80a0263f3b3d68
Merge: 7df28ce29 fea5c8a01
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1




___
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.0

2017-11-13 Thread nickm
commit fea5c8a015548f54e3ef1d3de67e7a82f916c213
Merge: 16bdb9e36 543fd89fb
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
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.8' into maint-0.2.9

2017-11-13 Thread nickm
commit 543fd89fb7fe4817b5e59beb132f5331ee7a2f48
Merge: ab415ae95 800797e7f
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
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.0] Merge branch 'maint-0.3.0' into release-0.3.0

2017-11-13 Thread nickm
commit fa3cad363e90a0a38f553a2b2ba2719c17698d9f
Merge: f5bd987c7 fea5c8a01
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.0' into release-0.3.0

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
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.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-11-13 Thread nickm
commit fea5c8a015548f54e3ef1d3de67e7a82f916c213
Merge: 16bdb9e36 543fd89fb
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
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

2017-11-13 Thread nickm
commit 05ae99566549b57e7003e5c243f199f3aaa1f857
Merge: d0b75b5ad 562b3c967
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2




___
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.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-11-13 Thread nickm
commit 543fd89fb7fe4817b5e59beb132f5331ee7a2f48
Merge: ab415ae95 800797e7f
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
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.0] 22839: fix check_heap_buffer buffer size in test-memwipe

2017-11-13 Thread nickm
commit 7ba873ca2da35dc3bcf08d458b78641ddad63949
Author: Ties Stuij 
Date:   Sun Aug 13 17:55:45 2017 +0200

22839: fix check_heap_buffer buffer size in test-memwipe
---
 src/test/test-memwipe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 5d4fcec66..2cb4215b6 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -76,7 +76,7 @@ static unsigned
 check_a_buffer(void)
 {
   unsigned int i;
-  volatile char buf[1024];
+  volatile char buf[BUF_LEN];
   unsigned sum = 0;
 
   /* See if this buffer has the string in it.



___
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.0

2017-11-13 Thread nickm
commit fea5c8a015548f54e3ef1d3de67e7a82f916c213
Merge: 16bdb9e36 543fd89fb
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
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.8] Merge branch 'maint-0.2.8' into release-0.2.8

2017-11-13 Thread nickm
commit b5873fa7778bb3080f5bd38e34c8533da497362b
Merge: f4e033288 800797e7f
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.8' into release-0.2.8

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
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 'bug23291_028' into maint-0.2.8

2017-11-13 Thread nickm
commit 800797e7f3c6cfacbf9655ef7d57ba96028a5c06
Merge: c9b76a12f b943cedf3
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:55 2017 -0500

Merge branch 'bug23291_028' into maint-0.2.8

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)



___
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

2017-11-13 Thread nickm
commit 05ae99566549b57e7003e5c243f199f3aaa1f857
Merge: d0b75b5ad 562b3c967
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

___
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 'bug23291_028' into maint-0.2.8

2017-11-13 Thread nickm
commit 800797e7f3c6cfacbf9655ef7d57ba96028a5c06
Merge: c9b76a12f b943cedf3
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:55 2017 -0500

Merge branch 'bug23291_028' into maint-0.2.8

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)



___
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.0' into maint-0.3.1

2017-11-13 Thread nickm
commit 562b3c96783628a57f60bb8adf80a0263f3b3d68
Merge: 7df28ce29 fea5c8a01
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1




___
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.3.0' into maint-0.3.1

2017-11-13 Thread nickm
commit 562b3c96783628a57f60bb8adf80a0263f3b3d68
Merge: 7df28ce29 fea5c8a01
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

___
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.0' into maint-0.3.1

2017-11-13 Thread nickm
commit 562b3c96783628a57f60bb8adf80a0263f3b3d68
Merge: 7df28ce29 fea5c8a01
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1




___
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

2017-11-13 Thread nickm
commit 70fcbd5f8336b8d435309b2b84906abdf91a8a96
Merge: d96f7f38e 562b3c967
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

___
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'

2017-11-13 Thread nickm
commit a5a87c1d97fd4aee46f170666f1540b927d6ce62
Merge: 0c6d05cdd 05ae99566
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.2'

___
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

2017-11-13 Thread nickm
commit dbb9ec494f61bb994a310f5cef849e0fdde30efd
Merge: 97c3fac6d 543fd89fb
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
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

2017-11-13 Thread nickm
commit 05ae99566549b57e7003e5c243f199f3aaa1f857
Merge: d0b75b5ad 562b3c967
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2




___
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.8' into maint-0.2.9

2017-11-13 Thread nickm
commit 543fd89fb7fe4817b5e59beb132f5331ee7a2f48
Merge: ab415ae95 800797e7f
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
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.8' into maint-0.2.9

2017-11-13 Thread nickm
commit 543fd89fb7fe4817b5e59beb132f5331ee7a2f48
Merge: ab415ae95 800797e7f
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
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.8] changes file for bug 23291

2017-11-13 Thread nickm
commit b943cedf3485d0d00c739e69fd2bb16d4e959867
Author: Nick Mathewson 
Date:   Mon Aug 21 15:04:35 2017 -0400

changes file for bug 23291
---
 changes/bug23291 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug23291 b/changes/bug23291
new file mode 100644
index 0..a5b0efda0
--- /dev/null
+++ b/changes/bug23291
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing):
+- Fix an undersized buffer in test-memwipe.c. Fixes bug 23291; bugfix on
+  0.2.7.2-alpha. Found and patched by Ties Stuij.



___
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.0

2017-11-13 Thread nickm
commit fea5c8a015548f54e3ef1d3de67e7a82f916c213
Merge: 16bdb9e36 543fd89fb
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
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.0

2017-11-13 Thread nickm
commit fea5c8a015548f54e3ef1d3de67e7a82f916c213
Merge: 16bdb9e36 543fd89fb
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
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.8] 22839: fix check_heap_buffer buffer size in test-memwipe

2017-11-13 Thread nickm
commit 7ba873ca2da35dc3bcf08d458b78641ddad63949
Author: Ties Stuij 
Date:   Sun Aug 13 17:55:45 2017 +0200

22839: fix check_heap_buffer buffer size in test-memwipe
---
 src/test/test-memwipe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 5d4fcec66..2cb4215b6 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -76,7 +76,7 @@ static unsigned
 check_a_buffer(void)
 {
   unsigned int i;
-  volatile char buf[1024];
+  volatile char buf[BUF_LEN];
   unsigned sum = 0;
 
   /* See if this buffer has the string in it.



___
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.8' into maint-0.2.9

2017-11-13 Thread nickm
commit 543fd89fb7fe4817b5e59beb132f5331ee7a2f48
Merge: ab415ae95 800797e7f
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
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] changes file for bug 23291

2017-11-13 Thread nickm
commit b943cedf3485d0d00c739e69fd2bb16d4e959867
Author: Nick Mathewson 
Date:   Mon Aug 21 15:04:35 2017 -0400

changes file for bug 23291
---
 changes/bug23291 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug23291 b/changes/bug23291
new file mode 100644
index 0..a5b0efda0
--- /dev/null
+++ b/changes/bug23291
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing):
+- Fix an undersized buffer in test-memwipe.c. Fixes bug 23291; bugfix on
+  0.2.7.2-alpha. Found and patched by Ties Stuij.



___
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 'bug23291_028' into maint-0.2.8

2017-11-13 Thread nickm
commit 800797e7f3c6cfacbf9655ef7d57ba96028a5c06
Merge: c9b76a12f b943cedf3
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:55 2017 -0500

Merge branch 'bug23291_028' into maint-0.2.8

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)



___
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.8' into maint-0.2.9

2017-11-13 Thread nickm
commit 543fd89fb7fe4817b5e59beb132f5331ee7a2f48
Merge: ab415ae95 800797e7f
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




___
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.0' into maint-0.3.1

2017-11-13 Thread nickm
commit 562b3c96783628a57f60bb8adf80a0263f3b3d68
Merge: 7df28ce29 fea5c8a01
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1




___
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 'maint-0.2.8' into maint-0.2.9

2017-11-13 Thread nickm
commit 543fd89fb7fe4817b5e59beb132f5331ee7a2f48
Merge: ab415ae95 800797e7f
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.8' into maint-0.2.9

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
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] 22839: fix check_heap_buffer buffer size in test-memwipe

2017-11-13 Thread nickm
commit 7ba873ca2da35dc3bcf08d458b78641ddad63949
Author: Ties Stuij 
Date:   Sun Aug 13 17:55:45 2017 +0200

22839: fix check_heap_buffer buffer size in test-memwipe
---
 src/test/test-memwipe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 5d4fcec66..2cb4215b6 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -76,7 +76,7 @@ static unsigned
 check_a_buffer(void)
 {
   unsigned int i;
-  volatile char buf[1024];
+  volatile char buf[BUF_LEN];
   unsigned sum = 0;
 
   /* See if this buffer has the string in it.



___
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.8] 22839: fix check_heap_buffer buffer size in test-memwipe

2017-11-13 Thread nickm
commit 7ba873ca2da35dc3bcf08d458b78641ddad63949
Author: Ties Stuij 
Date:   Sun Aug 13 17:55:45 2017 +0200

22839: fix check_heap_buffer buffer size in test-memwipe
---
 src/test/test-memwipe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 5d4fcec66..2cb4215b6 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -76,7 +76,7 @@ static unsigned
 check_a_buffer(void)
 {
   unsigned int i;
-  volatile char buf[1024];
+  volatile char buf[BUF_LEN];
   unsigned sum = 0;
 
   /* See if this buffer has the string in it.



___
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] changes file for bug 23291

2017-11-13 Thread nickm
commit b943cedf3485d0d00c739e69fd2bb16d4e959867
Author: Nick Mathewson 
Date:   Mon Aug 21 15:04:35 2017 -0400

changes file for bug 23291
---
 changes/bug23291 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug23291 b/changes/bug23291
new file mode 100644
index 0..a5b0efda0
--- /dev/null
+++ b/changes/bug23291
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing):
+- Fix an undersized buffer in test-memwipe.c. Fixes bug 23291; bugfix on
+  0.2.7.2-alpha. Found and patched by Ties Stuij.



___
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.0] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-11-13 Thread nickm
commit fea5c8a015548f54e3ef1d3de67e7a82f916c213
Merge: 16bdb9e36 543fd89fb
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
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.8] Merge branch 'bug23291_028' into maint-0.2.8

2017-11-13 Thread nickm
commit 800797e7f3c6cfacbf9655ef7d57ba96028a5c06
Merge: c9b76a12f b943cedf3
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:55 2017 -0500

Merge branch 'bug23291_028' into maint-0.2.8

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)



___
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.0] changes file for bug 23291

2017-11-13 Thread nickm
commit b943cedf3485d0d00c739e69fd2bb16d4e959867
Author: Nick Mathewson 
Date:   Mon Aug 21 15:04:35 2017 -0400

changes file for bug 23291
---
 changes/bug23291 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/bug23291 b/changes/bug23291
new file mode 100644
index 0..a5b0efda0
--- /dev/null
+++ b/changes/bug23291
@@ -0,0 +1,3 @@
+  o Minor bugfixes (testing):
+- Fix an undersized buffer in test-memwipe.c. Fixes bug 23291; bugfix on
+  0.2.7.2-alpha. Found and patched by Ties Stuij.



___
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.0] 22839: fix check_heap_buffer buffer size in test-memwipe

2017-11-13 Thread nickm
commit 7ba873ca2da35dc3bcf08d458b78641ddad63949
Author: Ties Stuij 
Date:   Sun Aug 13 17:55:45 2017 +0200

22839: fix check_heap_buffer buffer size in test-memwipe
---
 src/test/test-memwipe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c
index 5d4fcec66..2cb4215b6 100644
--- a/src/test/test-memwipe.c
+++ b/src/test/test-memwipe.c
@@ -76,7 +76,7 @@ static unsigned
 check_a_buffer(void)
 {
   unsigned int i;
-  volatile char buf[1024];
+  volatile char buf[BUF_LEN];
   unsigned sum = 0;
 
   /* See if this buffer has the string in it.



___
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 'bug23291_028' into maint-0.2.8

2017-11-13 Thread nickm
commit 800797e7f3c6cfacbf9655ef7d57ba96028a5c06
Merge: c9b76a12f b943cedf3
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:55 2017 -0500

Merge branch 'bug23291_028' into maint-0.2.8

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)



___
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 'bug23291_028' into maint-0.2.8

2017-11-13 Thread nickm
commit 800797e7f3c6cfacbf9655ef7d57ba96028a5c06
Merge: c9b76a12f b943cedf3
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:55 2017 -0500

Merge branch 'bug23291_028' into maint-0.2.8

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)



___
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.8] Merge branch 'bug23291_028' into maint-0.2.8

2017-11-13 Thread nickm
commit 800797e7f3c6cfacbf9655ef7d57ba96028a5c06
Merge: c9b76a12f b943cedf3
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:55 2017 -0500

Merge branch 'bug23291_028' into maint-0.2.8

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

___
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.0] Merge branch 'bug23291_028' into maint-0.2.8

2017-11-13 Thread nickm
commit 800797e7f3c6cfacbf9655ef7d57ba96028a5c06
Merge: c9b76a12f b943cedf3
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:55 2017 -0500

Merge branch 'bug23291_028' into maint-0.2.8

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)



___
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.0

2017-11-13 Thread nickm
commit fea5c8a015548f54e3ef1d3de67e7a82f916c213
Merge: 16bdb9e36 543fd89fb
Author: Nick Mathewson 
Date:   Mon Nov 13 12:57:58 2017 -0500

Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug23291| 3 +++
 src/test/test-memwipe.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)




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


  1   2   3   >