September 2019 - tor-commits - lists.torproject.org

[tor/master] pf: when extracting an IPv6 address, make sure we got an IPv6 address
by asn＠torproject.org 17 Sep '19

17 Sep '19

commit 97f7efa9e3316e4e8970a87a1ee53fd4fd0075d8 Author: Nick Mathewson <nickm(a)torproject.org> 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 proxy connection, we actually will. But we didn't check that, and so FreeBSD started warning us about a potential NULL pointer dereference. Fixes part of bug 31687; bugfix on 0.2.3.4-alpha when this code was added. --- changes/ticket31687_2 | 5 +++++ src/core/or/connection_edge.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/changes/ticket31687_2 b/changes/ticket31687_2 new file mode 100644 index 000000000..eadc69827 --- /dev/null +++ b/changes/ticket31687_2 @@ -0,0 +1,5 @@ + o Minor bugfixes (FreeBSD, PF-based proxy, IPv6): + - When extracting an IPv6 address from a PF-based proxy, verify + that we are actually configured to receive an IPv6 address, + and log an internal error if not. Fixes part of bug 31687; + bugfix on 0.2.3.4-alpha. diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c index e4b3455d1..7cc67d7f5 100644 --- a/src/core/or/connection_edge.c +++ b/src/core/or/connection_edge.c @@ -2547,8 +2547,11 @@ destination_from_pf(entry_connection_t *conn, socks_request_t *req) } else if (proxy_sa->sa_family == AF_INET6) { struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)proxy_sa; pnl.af = AF_INET6; - memcpy(&pnl.saddr.v6, tor_addr_to_in6(&ENTRY_TO_CONN(conn)->addr), - sizeof(struct in6_addr)); + const struct in6_addr *dest_in6 = + tor_addr_to_in6(&ENTRY_TO_CONN(conn)->addr); + if (BUG(!dest_in6)) + return -1; + memcpy(&pnl.saddr.v6, dest_in6, sizeof(struct in6_addr)); pnl.sport = htons(ENTRY_TO_CONN(conn)->port); memcpy(&pnl.daddr.v6, &sin6->sin6_addr, sizeof(struct in6_addr)); pnl.dport = sin6->sin6_port;

1 0

[tor/master] fp.c: Suppress float-conversion warnings on FreeBSD.
by asn＠torproject.org 17 Sep '19

17 Sep '19

commit 51475aee57523318d0b0a9e47dedad89ef1b578c Author: Nick Mathewson <nickm(a)torproject.org> 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 of GCC, and a common pattern for defining the floating-point classifier functions. Fixes part of 31687. I'm calling this a bugfux on 31687, when we started suppressing these warnings on Windows. --- changes/ticket31687_1 | 4 ++++ src/lib/math/fp.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/ticket31687_1 b/changes/ticket31687_1 new file mode 100644 index 000000000..2f4d44097 --- /dev/null +++ b/changes/ticket31687_1 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Suppress spurious float-conversion warnings from GCC when calling + floating-point classifier functions on FreeBSD. Fixes part of bug + 31687; bugfix on 0.3.1.5-alpha. diff --git a/src/lib/math/fp.c b/src/lib/math/fp.c index 4419635df..eafad358c 100644 --- a/src/lib/math/fp.c +++ b/src/lib/math/fp.c @@ -62,12 +62,16 @@ clamp_double_to_int64(double number) { int exponent; -#if defined(MINGW_ANY) && GCC_VERSION >= 409 +#if (defined(MINGW_ANY)||defined(__FreeBSD__)) && GCC_VERSION >= 409 /* Mingw's math.h uses gcc's __builtin_choose_expr() facility to declare isnan, isfinite, and signbit. But as implemented in at least some versions of gcc, __builtin_choose_expr() can generate type warnings even from branches that are not taken. So, suppress those warnings. + + FreeBSD's math.h uses an __fp_type_select() macro, which dispatches + based on sizeof -- again, this can generate type warnings from + branches that are not taken. */ #define PROBLEMATIC_FLOAT_CONVERSION_WARNING DISABLE_GCC_WARNING(float-conversion)

1 0

[tor/master] Merge branch 'ticket31687_035' into ticket31687_040
by asn＠torproject.org 17 Sep '19

17 Sep '19

commit 0327f9a0757e202666ec54460a69303633af4b33 Merge: 896a1ac50 97f7efa9e Author: Nick Mathewson <nickm(a)torproject.org> 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/connection_edge.c | 7 +++++-- src/lib/math/fp.c | 6 +++++- 4 files changed, 19 insertions(+), 3 deletions(-)

1 0

[tor/master] Merge branch 'tor-github/pr/1323'
by asn＠torproject.org 17 Sep '19

17 Sep '19

commit 585eaa123f21c4fed85865b938aeafac47730fec Merge: a28a682a1 34bab120d Author: George Kadianakis <desnacked(a)riseup.net> 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 +++++-- src/lib/math/fp.c | 17 ++++++++--------- 4 files changed, 22 insertions(+), 11 deletions(-)

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 17 Sep '19

17 Sep '19

commit ec5c92b2f444720bd2591587b3694d4817e95832 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 17 10:46:00 2019 +0000 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/nl/ssl-observatory.dtd b/nl/ssl-observatory.dtd index eedcff251..c68e5cf43 100644 --- a/nl/ssl-observatory.dtd +++ b/nl/ssl-observatory.dtd @@ -55,7 +55,7 @@ zeer ingrijpend bedrijfsnetwerk gebruikt:"> <!ENTITY ssl-observatory.prefs.explanation "HTTPS Everywhere kan het SSL-observatorium van EFF gebruiken. Dit doet twee dingen: ten eerste verstuurt het kopieën van HTTPS-certificaten naar het observatorium om ons -te helpen man-in-het-midden-aanvallen te detecteren en de veiligheid van het web te +te helpen man-in-the-middle-aanvallen te detecteren en de veiligheid van het web te verbeteren; ten tweede kunnen we u hierdoor waarschuwen over onveilige verbindingen en aanvallen op uw browser."> @@ -66,8 +66,8 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.explanation2 -"Als u bijvoorbeeld https://www.voorbeeld.nl bezoekt, geeft het door het -observatorium ontvangen certificaat aan dat iemand www.voorbeeld.nl bezocht, +"Als u bijvoorbeeld https://www.something.com bezoekt, geeft het door het +observatorium ontvangen certificaat aan dat iemand www.something.com bezocht, maar niet wie de website bezocht of welke specifieke pagina de bezoeker bekeek. Houd de muis boven de opties voor meer details:">

1 0

[tor-browser/tor-browser-68.1.0esr-9.0-2] fixup! Bug 26345: Hide tracking protection UI
by gk＠torproject.org 17 Sep '19

17 Sep '19

commit ea79fd5825ed9ea4e148baa473da3b97356bb38f Author: Alex Catarineu <acat(a)torproject.org> 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/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul index b2c70b9f041d..2b56e7301153 100644 --- a/browser/components/customizableui/content/panelUI.inc.xul +++ b/browser/components/customizableui/content/panelUI.inc.xul @@ -257,7 +257,7 @@ </hbox> </toolbaritem> <toolbarseparator class="sync-ui-item"/> - <toolbaritem> + <toolbaritem hidden="true"> <toolbarbutton id="appMenu-tp-button" class="subviewbutton subviewbutton-iconic" oncommand="ContentBlocking.openPreferences('appMenu-trackingprotection');"> @@ -266,7 +266,7 @@ <label id="appMenu-tp-category"/> </toolbarbutton> </toolbaritem> - <toolbarseparator id="appMenu-tp-separator"/> + <toolbarseparator hidden="true" id="appMenu-tp-separator"/> <toolbarbutton id="appMenu-new-window-button" class="subviewbutton subviewbutton-iconic" label="&newNavigatorCmd.label;"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 17 Sep '19

17 Sep '19

commit 222fae55cf7e37eabb18c58ff03a2ece9e122836 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 17 08:53:40 2019 +0000 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/contents+ja.po index 50c39ff22..e17591284 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -1063,7 +1063,7 @@ msgstr "ブランドアセット" #: templates/press.html:27 msgid "The Tor Browser" -msgstr "" +msgstr "Tor Browser" #: templates/press.html:30 msgid "Onion Services" @@ -1083,11 +1083,11 @@ msgstr "日付" #: templates/press.html:62 msgid "Publication" -msgstr "" +msgstr "媒体" #: templates/press.html:63 msgid "Topic" -msgstr "トピック" +msgstr "見出し" #: templates/reports.html:2 msgid "Founding Documents"

1 0

[exonerator/master] Update PostgreSQL JDBC driver version to 42.2.5.
by karsten＠torproject.org 17 Sep '19

17 Sep '19

commit 6babf3f62e7b23beed348d27b25e897936f96b72 Author: Karsten Loesing <karsten.loesing(a)gmx.net> 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/CHANGELOG.md b/CHANGELOG.md index 9f0db8f..ddbae79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ versions resolved by Ivy are the same as in Debian stretch with few exceptions. - Remove Cobertura from the build process. + - Update PostgreSQL JDBC driver version to 42.2.5. # Changes in version 4.1.0 - 2019-05-13 diff --git a/build.xml b/build.xml index 9aab930..9d522fe 100644 --- a/build.xml +++ b/build.xml @@ -40,7 +40,7 @@ <include name="jackson-databind-2.8.6.jar"/> <include name="logback-core-1.1.9.jar" /> <include name="logback-classic-1.1.9.jar" /> - <include name="postgresql-9.4.1212.jar"/> + <include name="postgresql-42.2.5.jar"/> <include name="slf4j-api-1.7.22.jar"/> </patternset> diff --git a/src/build b/src/build index 75cda35..0674958 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 75cda35ba7375ab0f5b12fa214620c3a29917097 +Subproject commit 0674958512c705255d4ec4631d3280068ce0a7af

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 17 Sep '19

17 Sep '19

commit bc3dc84bb814d6df0e6b91dfbc7ea838473fad82 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Sep 17 08:22:39 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+ja.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+ja.po b/contents+ja.po index f06638248..50c39ff22 100644 --- a/contents+ja.po +++ b/contents+ja.po @@ -1043,23 +1043,23 @@ msgstr "tor-dev に登録する" #: templates/press.html:7 msgid "Get support" -msgstr "" +msgstr "サポート" #: templates/press.html:9 msgid "Visit our Support Portal" -msgstr "" +msgstr "サポートポータルを見る" #: templates/press.html:12 msgid "Ask us on #tor" -msgstr "" +msgstr "#tor で質問する" #: templates/press.html:15 msgid "Write to a mailing list" -msgstr "" +msgstr "メーリングリストにメールを送る" #: templates/press.html:22 msgid "Brand Assets" -msgstr "" +msgstr "ブランドアセット" #: templates/press.html:27 msgid "The Tor Browser"

1 0

[metrics-web/master] Update to latest metrics-base and metrics-lib.
by karsten＠torproject.org 17 Sep '19

17 Sep '19

commit 3a663e8ff6b5b0c0757fe787cf92eaac91734ad5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 17 10:05:27 2019 +0200 Update to latest metrics-base and metrics-lib. This update includes an update of PostgreSQL JDBC driver version to 42.2.5. --- CHANGELOG.md | 1 + build.xml | 2 +- src/build | 2 +- src/submods/metrics-lib | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41bb5df..2147ed7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ versions resolved by Ivy are the same as in Debian stretch with few exceptions. - Remove Cobertura from the build process. + - Update PostgreSQL JDBC driver version to 42.2.5. # Changes in version 1.2.0 - 2018-08-25 diff --git a/build.xml b/build.xml index 038a82f..3e8048f 100644 --- a/build.xml +++ b/build.xml @@ -57,7 +57,7 @@ <include name="metrics-lib-${metricslibversion}-thin.jar"/> <include name="commons-compress-1.13.jar"/> <include name="commons-math3-3.6.1.jar"/> - <include name="postgresql-9.4.1212.jar"/> + <include name="postgresql-42.2.5.jar"/> <include name="javax.servlet-api-3.1.0.jar"/> <include name="xz-1.6.jar"/> </patternset> diff --git a/src/build b/src/build index 75cda35..0674958 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 75cda35ba7375ab0f5b12fa214620c3a29917097 +Subproject commit 0674958512c705255d4ec4631d3280068ce0a7af diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib index 7e396f0..c324d11 160000 --- a/src/submods/metrics-lib +++ b/src/submods/metrics-lib @@ -1 +1 @@ -Subproject commit 7e396f01ef6de4cb3cd7e2b7fc977b4af7b97e7f +Subproject commit c324d11035059bd9677af120dc6471aebebf980a

1 0