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

2019-09-17 Thread nickm
commit 1f19b5528f90eed57fdb4a7385eea14a6e5e84de Merge: 7b348e2ef ef3543558 Author: Nick Mathewson Date: Tue Sep 17 18:58:43 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+),

[tor-commits] [tor/release-0.4.1] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 409df19b5a0053175f05851086e6ef35c5bce2c0 Author: David Goulet Date: Mon Sep 9 11:55:33 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3 deletions

[tor-commits] [tor/release-0.4.0] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 409df19b5a0053175f05851086e6ef35c5bce2c0 Author: David Goulet Date: Mon Sep 9 11:55:33 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3 deletions

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

2019-09-17 Thread nickm
commit 2ebe1fcd52778ea2d305331f4283366eb35c9d93 Merge: 97f7efa9e 484710f25 Author: Nick Mathewson Date: Tue Sep 17 18:57:49 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 "ours" merge to avoid picking up 0.2.9 version of ticket 31673. ___

[tor-commits] [tor/release-0.4.0] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 484710f25be73d18fefa1e03339c9247e8ec7337 Author: David Goulet Date: Mon Sep 9 11:47:37 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/common/compat.c | 8 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff -

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-09-17 Thread nickm
commit 50f981719f1bc7066496bcc4ef78fcdbb1ff1806 Merge: cec42be57 ef3543558 Author: Nick Mathewson Date: Tue Sep 17 18:58:44 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5

2019-09-17 Thread nickm
commit dc41e6a80cc7df8d8f2b3ff91be2da38242c541d Merge: 2ebe1fcd5 409df19b5 Author: Nick Mathewson Date: Tue Sep 17 18:58:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files chang

[tor-commits] [tor/release-0.3.5] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 484710f25be73d18fefa1e03339c9247e8ec7337 Author: David Goulet Date: Mon Sep 9 11:47:37 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/common/compat.c | 8 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff -

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

2019-09-17 Thread nickm
commit 324e01372ca618727ffdedd8e590c8f11f44b09c Merge: ba7079fdd 484710f25 Author: Nick Mathewson Date: Tue Sep 17 18:58:28 2019 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/ticket31673 | 3 +++ src/common/compat.c | 8 +--- 2 files changed, 8 insertions(+), 3 deletions

[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5

2019-09-17 Thread nickm
commit dc41e6a80cc7df8d8f2b3ff91be2da38242c541d Merge: 2ebe1fcd5 409df19b5 Author: Nick Mathewson Date: Tue Sep 17 18:58:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files chang

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-09-17 Thread nickm
commit ef35435584c529906d385b0ce532aa6e43205608 Merge: 34bab120d dc41e6a80 Author: Nick Mathewson Date: Tue Sep 17 18:58:43 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3

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

2019-09-17 Thread nickm
commit 2ebe1fcd52778ea2d305331f4283366eb35c9d93 Merge: 97f7efa9e 484710f25 Author: Nick Mathewson Date: Tue Sep 17 18:57:49 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 "ours" merge to avoid picking up 0.2.9 version of ticket 31673. ___

[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5

2019-09-17 Thread nickm
commit dc41e6a80cc7df8d8f2b3ff91be2da38242c541d Merge: 2ebe1fcd5 409df19b5 Author: Nick Mathewson Date: Tue Sep 17 18:58:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files chang

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

2019-09-17 Thread nickm
commit 2ebe1fcd52778ea2d305331f4283366eb35c9d93 Merge: 97f7efa9e 484710f25 Author: Nick Mathewson Date: Tue Sep 17 18:57:49 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 "ours" merge to avoid picking up 0.2.9 version of ticket 31673. ___

[tor-commits] [tor/maint-0.4.0] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 484710f25be73d18fefa1e03339c9247e8ec7337 Author: David Goulet Date: Mon Sep 9 11:47:37 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/common/compat.c | 8 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff -

[tor-commits] [tor/maint-0.4.1] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 484710f25be73d18fefa1e03339c9247e8ec7337 Author: David Goulet Date: Mon Sep 9 11:47:37 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/common/compat.c | 8 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff -

[tor-commits] [tor/maint-0.4.1] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 409df19b5a0053175f05851086e6ef35c5bce2c0 Author: David Goulet Date: Mon Sep 9 11:55:33 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3 deletions

[tor-commits] [tor/maint-0.3.5] Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5

2019-09-17 Thread nickm
commit dc41e6a80cc7df8d8f2b3ff91be2da38242c541d Merge: 2ebe1fcd5 409df19b5 Author: Nick Mathewson Date: Tue Sep 17 18:58:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1307' into maint-0.3.5 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files chang

[tor-commits] [tor/maint-0.2.9] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 484710f25be73d18fefa1e03339c9247e8ec7337 Author: David Goulet Date: Mon Sep 9 11:47:37 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/common/compat.c | 8 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff -

[tor-commits] [tor/maint-0.3.5] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 409df19b5a0053175f05851086e6ef35c5bce2c0 Author: David Goulet Date: Mon Sep 9 11:55:33 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3 deletions

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

2019-09-17 Thread nickm
commit 2ebe1fcd52778ea2d305331f4283366eb35c9d93 Merge: 97f7efa9e 484710f25 Author: Nick Mathewson Date: Tue Sep 17 18:57:49 2019 -0400 Merge branch 'maint-0.2.9' into maint-0.3.5 "ours" merge to avoid picking up 0.2.9 version of ticket 31673. ___

[tor-commits] [tor/maint-0.4.0] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 409df19b5a0053175f05851086e6ef35c5bce2c0 Author: David Goulet Date: Mon Sep 9 11:55:33 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3 deletions

[tor-commits] [tor/maint-0.4.0] Merge branch 'maint-0.3.5' into maint-0.4.0

2019-09-17 Thread nickm
commit ef35435584c529906d385b0ce532aa6e43205608 Merge: 34bab120d dc41e6a80 Author: Nick Mathewson Date: Tue Sep 17 18:58:43 2019 -0400 Merge branch 'maint-0.3.5' into maint-0.4.0 changes/ticket31673 | 3 +++ src/lib/meminfo/meminfo.c | 7 --- 2 files changed, 7 insertions(+), 3

[tor-commits] [tor/maint-0.3.5] build: The is now deprecated on Linux

2019-09-17 Thread nickm
commit 484710f25be73d18fefa1e03339c9247e8ec7337 Author: David Goulet Date: Mon Sep 9 11:47:37 2019 -0400 build: The is now deprecated on Linux Closes #31673 --- changes/ticket31673 | 3 +++ src/common/compat.c | 8 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff -

[tor-commits] [tor/release-0.4.0] fp.c: Suppress float-conversion warnings on FreeBSD.

2019-09-17 Thread nickm
commit 51475aee57523318d0b0a9e47dedad89ef1b578c Author: Nick Mathewson Date: Tue Sep 10 10:53:39 2019 -0400 fp.c: Suppress float-conversion warnings on FreeBSD. We used to do this on Windows only, but it appears to affect multiple platforms when building with certain versions o

[tor-commits] [tor/release-0.4.1] Merge branch 'ticket31687_035' into ticket31687_040

2019-09-17 Thread nickm
commit 0327f9a0757e202666ec54460a69303633af4b33 Merge: 896a1ac50 97f7efa9e Author: Nick Mathewson Date: Thu Sep 12 09:51:04 2019 -0400 Merge branch 'ticket31687_035' into ticket31687_040 changes/ticket31687_1 | 4 changes/ticket31687_2 | 5 + src/core/or/connectio

[tor-commits] [tor/release-0.3.5] fp.c: Suppress float-conversion warnings on FreeBSD.

2019-09-17 Thread nickm
commit 51475aee57523318d0b0a9e47dedad89ef1b578c Author: Nick Mathewson Date: Tue Sep 10 10:53:39 2019 -0400 fp.c: Suppress float-conversion warnings on FreeBSD. We used to do this on Windows only, but it appears to affect multiple platforms when building with certain versions o

[tor-commits] [tor/release-0.4.1] pf: when extracting an IPv6 address, make sure we got an IPv6 address

2019-09-17 Thread nickm
commit 97f7efa9e3316e4e8970a87a1ee53fd4fd0075d8 Author: Nick Mathewson Date: Tue Sep 10 11:07:25 2019 -0400 pf: when extracting an IPv6 address, make sure we got an IPv6 address Our code assumes that when we're configured to get IPv6 addresses out of a TRANS_PF transparent prox

[tor-commits] [tor/release-0.4.0] pf: when extracting an IPv6 address, make sure we got an IPv6 address

2019-09-17 Thread nickm
commit 97f7efa9e3316e4e8970a87a1ee53fd4fd0075d8 Author: Nick Mathewson Date: Tue Sep 10 11:07:25 2019 -0400 pf: when extracting an IPv6 address, make sure we got an IPv6 address Our code assumes that when we're configured to get IPv6 addresses out of a TRANS_PF transparent prox

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

2019-09-17 Thread nickm
commit 03c3fa456ddd6cc5c0767a962a7908bace5948e3 Merge: b485554d5 97f7efa9e Author: Nick Mathewson Date: Tue Sep 17 18:56:51 2019 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket31687_1 | 4 changes/ticket31687_2 | 5 + src/core/or/connection_edge

[tor-commits] [tor/release-0.4.1] fp.c: Suppress float-conversion warnings on FreeBSD.

2019-09-17 Thread nickm
commit 51475aee57523318d0b0a9e47dedad89ef1b578c Author: Nick Mathewson Date: Tue Sep 10 10:53:39 2019 -0400 fp.c: Suppress float-conversion warnings on FreeBSD. We used to do this on Windows only, but it appears to affect multiple platforms when building with certain versions o

[tor-commits] [tor/release-0.4.0] Ticket 31687: fix for tor_isinf() as well

2019-09-17 Thread nickm
commit 34bab120df213970edf32db1f3462ff2585ee098 Author: Nick Mathewson Date: Thu Sep 12 09:53:13 2019 -0400 Ticket 31687: fix for tor_isinf() as well tor_isinf() was new in 0.4.0, and also needs to look at the same rules as clamp_double_to_i64() --- src/lib/math/fp.c | 11 +++-

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

2019-09-17 Thread nickm
commit c76907b54d2e49d4771aa079683ad75cd763b24d Merge: ece35992a cec42be57 Author: Nick Mathewson Date: Tue Sep 17 18:56:52 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/ticket31687_1 | 4 changes/ticket31687_2 | 5 + src/core/or/connection_ed

[tor-commits] [tor/release-0.4.1] Ticket 31687: fix for tor_isinf() as well

2019-09-17 Thread nickm
commit 34bab120df213970edf32db1f3462ff2585ee098 Author: Nick Mathewson Date: Thu Sep 12 09:53:13 2019 -0400 Ticket 31687: fix for tor_isinf() as well tor_isinf() was new in 0.4.0, and also needs to look at the same rules as clamp_double_to_i64() --- src/lib/math/fp.c | 11 +++-

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

2019-09-17 Thread nickm
commit cec42be570fcbbfbc5971e0ceba21e8eadd32d21 Merge: ab74c3560 34bab120d Author: Nick Mathewson Date: Tue Sep 17 18:56:52 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket31687_1 | 4 changes/ticket31687_2 | 5 + src/core/or/connection_edge

[tor-commits] [tor/release-0.4.0] Merge branch 'ticket31687_035' into ticket31687_040

2019-09-17 Thread nickm
commit 0327f9a0757e202666ec54460a69303633af4b33 Merge: 896a1ac50 97f7efa9e Author: Nick Mathewson Date: Thu Sep 12 09:51:04 2019 -0400 Merge branch 'ticket31687_035' into ticket31687_040 changes/ticket31687_1 | 4 changes/ticket31687_2 | 5 + src/core/or/connectio

[tor-commits] [tor/master] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-09-17 Thread nickm
commit cec42be570fcbbfbc5971e0ceba21e8eadd32d21 Merge: ab74c3560 34bab120d Author: Nick Mathewson Date: Tue Sep 17 18:56:52 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket31687_1 | 4 changes/ticket31687_2 | 5 + src/core/or/connection_edge

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

2019-09-17 Thread nickm
commit dcd64626053e221905ea2de2c53bf0eac4e54ac5 Merge: 88cf964ca cec42be57 Author: Nick Mathewson Date: Tue Sep 17 18:56:52 2019 -0400 Merge branch 'maint-0.4.1' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproje

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

2019-09-17 Thread nickm
commit 7b348e2efd0ef702554ce1e44cec958d8dd25dd2 Merge: b17e3f6a3 34bab120d Author: Nick Mathewson Date: Tue Sep 17 18:56:52 2019 -0400 Merge branch 'maint-0.4.0' into release-0.4.0 changes/ticket31687_1 | 4 changes/ticket31687_2 | 5 + src/core/or/connection_ed

[tor-commits] [tor/release-0.3.5] pf: when extracting an IPv6 address, make sure we got an IPv6 address

2019-09-17 Thread nickm
commit 97f7efa9e3316e4e8970a87a1ee53fd4fd0075d8 Author: Nick Mathewson Date: Tue Sep 10 11:07:25 2019 -0400 pf: when extracting an IPv6 address, make sure we got an IPv6 address Our code assumes that when we're configured to get IPv6 addresses out of a TRANS_PF transparent prox

[tor-commits] [tor/maint-0.4.1] Ticket 31687: fix for tor_isinf() as well

2019-09-17 Thread nickm
commit 34bab120df213970edf32db1f3462ff2585ee098 Author: Nick Mathewson Date: Thu Sep 12 09:53:13 2019 -0400 Ticket 31687: fix for tor_isinf() as well tor_isinf() was new in 0.4.0, and also needs to look at the same rules as clamp_double_to_i64() --- src/lib/math/fp.c | 11 +++-

[tor-commits] [tor/maint-0.4.1] pf: when extracting an IPv6 address, make sure we got an IPv6 address

2019-09-17 Thread nickm
commit 97f7efa9e3316e4e8970a87a1ee53fd4fd0075d8 Author: Nick Mathewson Date: Tue Sep 10 11:07:25 2019 -0400 pf: when extracting an IPv6 address, make sure we got an IPv6 address Our code assumes that when we're configured to get IPv6 addresses out of a TRANS_PF transparent prox

[tor-commits] [tor/maint-0.3.5] fp.c: Suppress float-conversion warnings on FreeBSD.

2019-09-17 Thread nickm
commit 51475aee57523318d0b0a9e47dedad89ef1b578c Author: Nick Mathewson Date: Tue Sep 10 10:53:39 2019 -0400 fp.c: Suppress float-conversion warnings on FreeBSD. We used to do this on Windows only, but it appears to affect multiple platforms when building with certain versions o

[tor-commits] [tor/maint-0.4.1] Merge branch 'maint-0.4.0' into maint-0.4.1

2019-09-17 Thread nickm
commit cec42be570fcbbfbc5971e0ceba21e8eadd32d21 Merge: ab74c3560 34bab120d Author: Nick Mathewson Date: Tue Sep 17 18:56:52 2019 -0400 Merge branch 'maint-0.4.0' into maint-0.4.1 changes/ticket31687_1 | 4 changes/ticket31687_2 | 5 + src/core/or/connection_edge

[tor-commits] [tor/maint-0.4.0] Ticket 31687: fix for tor_isinf() as well

2019-09-17 Thread nickm
commit 34bab120df213970edf32db1f3462ff2585ee098 Author: Nick Mathewson Date: Thu Sep 12 09:53:13 2019 -0400 Ticket 31687: fix for tor_isinf() as well tor_isinf() was new in 0.4.0, and also needs to look at the same rules as clamp_double_to_i64() --- src/lib/math/fp.c | 11 +++-

[tor-commits] [tor/maint-0.4.0] pf: when extracting an IPv6 address, make sure we got an IPv6 address

2019-09-17 Thread nickm
commit 97f7efa9e3316e4e8970a87a1ee53fd4fd0075d8 Author: Nick Mathewson Date: Tue Sep 10 11:07:25 2019 -0400 pf: when extracting an IPv6 address, make sure we got an IPv6 address Our code assumes that when we're configured to get IPv6 addresses out of a TRANS_PF transparent prox

[tor-commits] [tor/maint-0.4.1] Merge branch 'ticket31687_035' into ticket31687_040

2019-09-17 Thread nickm
commit 0327f9a0757e202666ec54460a69303633af4b33 Merge: 896a1ac50 97f7efa9e Author: Nick Mathewson Date: Thu Sep 12 09:51:04 2019 -0400 Merge branch 'ticket31687_035' into ticket31687_040 changes/ticket31687_1 | 4 changes/ticket31687_2 | 5 + src/core/or/connectio

[tor-commits] [tor/maint-0.3.5] pf: when extracting an IPv6 address, make sure we got an IPv6 address

2019-09-17 Thread nickm
commit 97f7efa9e3316e4e8970a87a1ee53fd4fd0075d8 Author: Nick Mathewson Date: Tue Sep 10 11:07:25 2019 -0400 pf: when extracting an IPv6 address, make sure we got an IPv6 address Our code assumes that when we're configured to get IPv6 addresses out of a TRANS_PF transparent prox

[tor-commits] [tor/maint-0.4.1] fp.c: Suppress float-conversion warnings on FreeBSD.

2019-09-17 Thread nickm
commit 51475aee57523318d0b0a9e47dedad89ef1b578c Author: Nick Mathewson Date: Tue Sep 10 10:53:39 2019 -0400 fp.c: Suppress float-conversion warnings on FreeBSD. We used to do this on Windows only, but it appears to affect multiple platforms when building with certain versions o

[tor-commits] [tor/maint-0.4.0] fp.c: Suppress float-conversion warnings on FreeBSD.

2019-09-17 Thread nickm
commit 51475aee57523318d0b0a9e47dedad89ef1b578c Author: Nick Mathewson Date: Tue Sep 10 10:53:39 2019 -0400 fp.c: Suppress float-conversion warnings on FreeBSD. We used to do this on Windows only, but it appears to affect multiple platforms when building with certain versions o

[tor-commits] [tor/maint-0.4.0] Merge branch 'ticket31687_035' into ticket31687_040

2019-09-17 Thread nickm
commit 0327f9a0757e202666ec54460a69303633af4b33 Merge: 896a1ac50 97f7efa9e Author: Nick Mathewson Date: Thu Sep 12 09:51:04 2019 -0400 Merge branch 'ticket31687_035' into ticket31687_040 changes/ticket31687_1 | 4 changes/ticket31687_2 | 5 + src/core/or/connectio

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

2019-09-17 Thread nickm
commit ece35992aca666cacbebf85686609fba923fb371 Merge: 6c3f339f0 ab74c3560 Author: Nick Mathewson Date: Tue Sep 17 18:55:18 2019 -0400 Merge branch 'maint-0.4.1' into release-0.4.1 changes/bug31552| 5 +++ changes/bug31696| 5 +++ src/feature/dira

[tor-commits] [tor/maint-0.4.1] Stub out some more functions in dirvote/*.h, fix compilation.

2019-09-17 Thread nickm
commit 4256ee0d379daf35098c396757ce92b97b025c6e Author: Nick Mathewson Date: Thu Aug 29 09:50:38 2019 -0400 Stub out some more functions in dirvote/*.h, fix compilation. This fixes LTO compilation for Android and -O0 compilation in general, when --disable-module-dirauth is prov

[tor-commits] [tor/master] Merge branch 'ticket31552_041' into maint-0.4.1

2019-09-17 Thread nickm
commit ab74c3560a423227fff337b1033716920920603b Merge: 0891a31ad fb0e8966f Author: Nick Mathewson Date: Tue Sep 17 18:54:05 2019 -0400 Merge branch 'ticket31552_041' into maint-0.4.1 changes/bug31552| 5 +++ src/feature/dirauth/keypin.h| 18 - src/feat

[tor-commits] [tor/release-0.4.1] Stub more functions in dirvote headers to fix more of 31552.

2019-09-17 Thread nickm
commit fb0e8966f00c4349602594f312dae60cad2ea11d Author: Nick Mathewson Date: Thu Aug 29 11:18:42 2019 -0400 Stub more functions in dirvote headers to fix more of 31552. --- src/feature/dirauth/keypin.h| 18 -- src/feature/dirauth/process_descs.h | 69 +++

[tor-commits] [tor/release-0.4.1] madvise: tolerate EINVAL and ENOSYS when minherit fails

2019-09-17 Thread nickm
commit 0891a31ad32d0567fbc8f73a0598925cb543d699 Author: Nick Mathewson Date: Wed Sep 11 09:13:50 2019 -0400 madvise: tolerate EINVAL and ENOSYS when minherit fails These errors can occur if we are built on a system with support for madvise(MADV_NOFORK) but then we are run on a

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

2019-09-17 Thread nickm
commit 88cf964ca3b117a427f3551e107cd86103e14464 Merge: 75d3c0821 ab74c3560 Author: Nick Mathewson Date: Tue Sep 17 18:55:18 2019 -0400 Merge branch 'maint-0.4.1' ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproje

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

2019-09-17 Thread nickm
commit ab74c3560a423227fff337b1033716920920603b Merge: 0891a31ad fb0e8966f Author: Nick Mathewson Date: Tue Sep 17 18:54:05 2019 -0400 Merge branch 'ticket31552_041' into maint-0.4.1 changes/bug31552| 5 +++ src/feature/dirauth/keypin.h| 18 - src/feat

[tor-commits] [tor/maint-0.4.1] Merge branch 'ticket31552_041' into maint-0.4.1

2019-09-17 Thread nickm
commit ab74c3560a423227fff337b1033716920920603b Merge: 0891a31ad fb0e8966f Author: Nick Mathewson Date: Tue Sep 17 18:54:05 2019 -0400 Merge branch 'ticket31552_041' into maint-0.4.1 changes/bug31552| 5 +++ src/feature/dirauth/keypin.h| 18 - src/feat

[tor-commits] [tor/release-0.4.1] Stub out some more functions in dirvote/*.h, fix compilation.

2019-09-17 Thread nickm
commit 4256ee0d379daf35098c396757ce92b97b025c6e Author: Nick Mathewson Date: Thu Aug 29 09:50:38 2019 -0400 Stub out some more functions in dirvote/*.h, fix compilation. This fixes LTO compilation for Android and -O0 compilation in general, when --disable-module-dirauth is prov

[tor-commits] [tor/maint-0.4.1] Stub more functions in dirvote headers to fix more of 31552.

2019-09-17 Thread nickm
commit fb0e8966f00c4349602594f312dae60cad2ea11d Author: Nick Mathewson Date: Thu Aug 29 11:18:42 2019 -0400 Stub more functions in dirvote headers to fix more of 31552. --- src/feature/dirauth/keypin.h| 18 -- src/feature/dirauth/process_descs.h | 69 +++

[tor-commits] [tor/maint-0.4.1] madvise: tolerate EINVAL and ENOSYS when minherit fails

2019-09-17 Thread nickm
commit 0891a31ad32d0567fbc8f73a0598925cb543d699 Author: Nick Mathewson Date: Wed Sep 11 09:13:50 2019 -0400 madvise: tolerate EINVAL and ENOSYS when minherit fails These errors can occur if we are built on a system with support for madvise(MADV_NOFORK) but then we are run on a

[tor-commits] [community/develop] update user research section

2019-09-17 Thread antonela
commit 28b7768d5469f0b9e8471ba71fb291bc20c37f1a Author: Antonela Date: Tue Sep 17 16:12:03 2019 -0300 update user research section --- content/user-research/become-tester/contents.lr | 22 ++ content/user-research/contents.lr | 10 ++--- content/user-research/current/

[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2019-09-17 Thread translation
commit 0f0a011566ee5742d1d0604005c8e900be804281 Author: Translation commit bot Date: Tue Sep 17 18:52:34 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+ja.po b/co

[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2019-09-17 Thread translation
commit 5714c1f9a8f0c0f2f1c4df6f568abf206c9a754a Author: Translation commit bot Date: Tue Sep 17 18:22:33 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/contents+ja.po b/co

[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2019-09-17 Thread translation
commit 3cabe5083c827c82846e2032ed0289c0f8c3caf6 Author: Translation commit bot Date: Tue Sep 17 17:52:32 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents+ja.po

[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2019-09-17 Thread translation
commit 51e52ec79e8b77b97b1c4e119b96c2c638c29d83 Author: Translation commit bot Date: Tue Sep 17 17:22:31 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+ja.po b/contents+ja.po index

[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2019-09-17 Thread translation
commit d833a4740b541fa1a4b709b2480976a908478e7b Author: Translation commit bot Date: Tue Sep 17 16:52:35 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contents+ja.po b/contents+ja.po index

[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2019-09-17 Thread translation
commit 677895fca37e9ddae8302f2a5070e57d1be1e8f5 Author: Translation commit bot Date: Tue Sep 17 16:22:29 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contents+ja.po b/co

[tor-commits] [community/master] Merge remote-tracking branch 'nick/master'

2019-09-17 Thread phw
commit 80c7169ad5bfa08b45e27a2c5bdf3f92d2cc5bb3 Merge: 315fcc6 fd08625 Author: Philipp Winter Date: Tue Sep 17 09:13:06 2019 -0700 Merge remote-tracking branch 'nick/master' .../technical-setup/bridge/openbsd/contents.lr | 16 1 file changed, 12 insertions(+), 4

[tor-commits] [community/master] Change obfs4proxy patch in OpenBSD install doc

2019-09-17 Thread phw
commit fd0862583435e73d0c04f7ee49b5e57fe16c1dba Author: Nick Gnazzo Date: Thu Sep 12 13:11:52 2019 -0400 Change obfs4proxy patch in OpenBSD install doc By default, the 'obfs4proxy' in OpenBSD 6.5 seems to install the obfs4proxy binary in /usr/local/bin, as opposed to /usr/bin.

[tor-commits] [community/master] Fix OpenBSD tor bridge instructions (data dir + logging perms)

2019-09-17 Thread phw
commit bbcb1574fb69804863d33ac96129965269cedc21 Author: Nick Gnazzo Date: Thu Sep 12 10:48:39 2019 -0400 Fix OpenBSD tor bridge instructions (data dir + logging perms) --- .../technical-setup/bridge/openbsd/contents.lr | 14 +++--- 1 file changed, 11 insertions(+), 3 de

[tor-commits] [translation/whisperback] https://gitweb.torproject.org/translation.git/commit/?h=whisperback

2019-09-17 Thread translation
commit 53b7d2918a93c0fdbf40c9c0d38d38765366d450 Author: Translation commit bot Date: Tue Sep 17 15:52:47 2019 + https://gitweb.torproject.org/translation.git/commit/?h=whisperback --- el/el.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/el/el.po b/el/el.po

[tor-commits] [translation/torbutton-torbuttondtd] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd

2019-09-17 Thread translation
commit ca466a0f44aee78d3af9b9f13907f3521a97f58d Author: Translation commit bot Date: Tue Sep 17 15:51:04 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd --- de/torbutton.dtd | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/de/

[tor-commits] [translation/torbutton-torbuttondtd_completed] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd_completed

2019-09-17 Thread translation
commit 1e75d462464cad4f88db13a341febf87f2fff2ea Author: Translation commit bot Date: Tue Sep 17 15:51:10 2019 + https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttondtd_completed --- de/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --g

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

2019-09-17 Thread nickm
commit 75d3c08219d39f98576c99479b774441158e306f Author: Nick Mathewson Date: Tue Sep 17 11:36:43 2019 -0400 bump to 0.4.2.1-alpha-dev --- configure.ac| 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h| 2 +- 3 files changed, 4

[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere

2019-09-17 Thread translation
commit cd7e147534baada02328e447ae2ea49f11fbfbe9 Author: Translation commit bot Date: Tue Sep 17 15:15:58 2019 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- nl/ssl-observatory.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2019-09-17 Thread translation
commit 152a80d97fa7834457ac032c514098ec5c625526 Author: Translation commit bot Date: Tue Sep 17 14:53:32 2019 + https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+fr.po b

[tor-commits] [translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed

2019-09-17 Thread translation
commit 60e085dcf99477a1e9087d9a436a3fdd23149e97 Author: Translation commit bot Date: Tue Sep 17 14:53:11 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+fr.po | 1470 1 file changed,

[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2019-09-17 Thread translation
commit 8b308be53463e66048acf9b39f2287ae3f9a11ae Author: Translation commit bot Date: Tue Sep 17 14:53:02 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+fr.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+fr.po b/

[tor-commits] [tpo/master] 0.4.2.1-alpha is now the alpha release

2019-09-17 Thread nickm
commit bae229b4928c53211014d9d9b98e72eeaedb721a Author: Nick Mathewson Date: Tue Sep 17 10:49:35 2019 -0400 0.4.2.1-alpha is now the alpha release --- databags/versions.ini | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini i

[tor-commits] [translation/donatepages-messagespot_completed] https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot_completed

2019-09-17 Thread translation
commit 44cf4dadfdbe11a970bea920fea3c20c362a059d Author: Translation commit bot Date: Tue Sep 17 14:45:44 2019 + https://gitweb.torproject.org/translation.git/commit/?h=donatepages-messagespot_completed --- locale/es/LC_MESSAGES/messages.po | 79 +++

[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2019-09-17 Thread translation
commit 1e861825e16df706cdd63ce10c6d6b3e54e9ecde Author: Translation commit bot Date: Tue Sep 17 14:22:50 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+ja.po b/conten

[tor-commits] [translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot

2019-09-17 Thread translation
commit 4753f193ff73ee6298fdb56d9d38b9f73ec835c2 Author: Translation commit bot Date: Tue Sep 17 14:19:58 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+es.po | 21 +++-- 1 file changed, 19 insertions(+), 2 deletions(-)

[tor-commits] [translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed

2019-09-17 Thread translation
commit 9593cbf46ce3f9367f78f69bd4b6938d80fc5753 Author: Translation commit bot Date: Tue Sep 17 13:53:42 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+fr.po| 1445 - contents+pt-BR.p

[tor-commits] [tpo/master] Add banner to templates

2019-09-17 Thread hiro
commit d118ec92946f27b81543109fbb5962f9b138b355 Author: hiro Date: Fri Sep 13 22:26:31 2019 +0200 Add banner to templates --- templates/homepage.html | 1 + templates/layout.html | 1 + templates/meta.html | 1 + 3 files changed, 3 insertions(+) diff --git a/templates/homepage.html

[tor-commits] [tpo/master] Update digital climate strike banner

2019-09-17 Thread hiro
commit f4972e7aad4528574c222cc3ff795e5748245979 Author: hiro Date: Mon Sep 16 14:10:29 2019 +0200 Update digital climate strike banner --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 77fc882..09c5813 16 --- a/lego +++ b/lego @@ -1 +1 @@ -S

[tor-commits] [tpo/master] Add climate banner style and stuff

2019-09-17 Thread hiro
commit 91a80d3c1c4e70f49fbc56b77ae01f9dfc78bb32 Author: hiro Date: Fri Sep 13 22:22:57 2019 +0200 Add climate banner style and stuff --- assets/static/images/dcs-logo.png | Bin 0 -> 10135 bytes lego | 2 +- templates/bottom_banner.html | 1 + 3 files

[tor-commits] [tor/master] Run format_changelog again

2019-09-17 Thread nickm
commit 9bbddbcb212f7309598e8e85163704291cb982d1 Author: Nick Mathewson Date: Tue Sep 17 08:00:47 2019 -0400 Run format_changelog again --- ChangeLog | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d604af54e..ad1f658e5 100644 --- a/

[tor-commits] [tor/master] pick a release date for 0.4.2.1-alpha

2019-09-17 Thread nickm
commit b5f39955d1ad14295a9ef415d13a8c6bfd25f8b9 Author: Nick Mathewson Date: Tue Sep 17 08:19:28 2019 -0400 pick a release date for 0.4.2.1-alpha --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ad1f658e5..0c1191bac 100644 --- a/

[tor-commits] [tor/master] Fold new entries into 0.4.2.1-alpha changelog

2019-09-17 Thread nickm
commit 1f0848e0b6674e8c8f3379440c91428bf550dddb Author: Nick Mathewson Date: Tue Sep 17 08:00:24 2019 -0400 Fold new entries into 0.4.2.1-alpha changelog --- ChangeLog | 9 + changes/ticket31687_1 | 4 changes/ticket31687_2 | 5 - 3 files changed, 9 insertions(

[tor-commits] [tor/master] Merge branch 'tor-github/pr/1323'

2019-09-17 Thread asn
commit 585eaa123f21c4fed85865b938aeafac47730fec Merge: a28a682a1 34bab120d Author: George Kadianakis Date: Tue Sep 17 14:51:43 2019 +0300 Merge branch 'tor-github/pr/1323' changes/ticket31687_1 | 4 changes/ticket31687_2 | 5 + src/core/or/connection_edge.c | 7

[tor-commits] [tor/master] pf: when extracting an IPv6 address, make sure we got an IPv6 address

2019-09-17 Thread asn
commit 97f7efa9e3316e4e8970a87a1ee53fd4fd0075d8 Author: Nick Mathewson Date: Tue Sep 10 11:07:25 2019 -0400 pf: when extracting an IPv6 address, make sure we got an IPv6 address Our code assumes that when we're configured to get IPv6 addresses out of a TRANS_PF transparent prox

[tor-commits] [tor/master] Ticket 31687: fix for tor_isinf() as well

2019-09-17 Thread asn
commit 34bab120df213970edf32db1f3462ff2585ee098 Author: Nick Mathewson Date: Thu Sep 12 09:53:13 2019 -0400 Ticket 31687: fix for tor_isinf() as well tor_isinf() was new in 0.4.0, and also needs to look at the same rules as clamp_double_to_i64() --- src/lib/math/fp.c | 11 +++-

[tor-commits] [tor/master] Merge branch 'ticket31687_035' into ticket31687_040

2019-09-17 Thread asn
commit 0327f9a0757e202666ec54460a69303633af4b33 Merge: 896a1ac50 97f7efa9e Author: Nick Mathewson Date: Thu Sep 12 09:51:04 2019 -0400 Merge branch 'ticket31687_035' into ticket31687_040 changes/ticket31687_1 | 4 changes/ticket31687_2 | 5 + src/core/or/connectio

[tor-commits] [tor/master] fp.c: Suppress float-conversion warnings on FreeBSD.

2019-09-17 Thread asn
commit 51475aee57523318d0b0a9e47dedad89ef1b578c Author: Nick Mathewson Date: Tue Sep 10 10:53:39 2019 -0400 fp.c: Suppress float-conversion warnings on FreeBSD. We used to do this on Windows only, but it appears to affect multiple platforms when building with certain versions o

[tor-commits] [translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere

2019-09-17 Thread translation
commit ec5c92b2f444720bd2591587b3694d4817e95832 Author: Translation commit bot Date: Tue Sep 17 10:46:00 2019 + https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- nl/ssl-observatory.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/

[tor-commits] [tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 26345: Hide tracking protection UI

2019-09-17 Thread gk
commit ea79fd5825ed9ea4e148baa473da3b97356bb38f Author: Alex Catarineu Date: Tue Sep 17 11:24:46 2019 +0200 fixup! Bug 26345: Hide tracking protection UI --- browser/components/customizableui/content/panelUI.inc.xul | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/br

[tor-commits] [translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web

2019-09-17 Thread translation
commit 222fae55cf7e37eabb18c58ff03a2ece9e122836 Author: Translation commit bot Date: Tue Sep 17 08:53:40 2019 + https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+ja.po b/

[tor-commits] [exonerator/master] Update PostgreSQL JDBC driver version to 42.2.5.

2019-09-17 Thread karsten
commit 6babf3f62e7b23beed348d27b25e897936f96b72 Author: Karsten Loesing Date: Tue Sep 17 10:27:28 2019 +0200 Update PostgreSQL JDBC driver version to 42.2.5. --- CHANGELOG.md | 1 + build.xml| 2 +- src/build| 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHA

<    1   2   3   >