[tor-commits] [translation/support-censorship] Update translations for support-censorship

2018-06-21 Thread translation
commit 133b2543248996ce7be8951c02c85f63334f6fae Author: Translation commit bot Date: Thu Jun 21 07:48:57 2018 + Update translations for support-censorship --- fi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi.json b/fi.json index ab2506569..aea3ea933

[tor-commits] [translation/support-connecting] Update translations for support-connecting

2018-06-21 Thread translation
commit 15915355178faab25d49a2c80f945ff0f07cb771 Author: Translation commit bot Date: Thu Jun 21 07:19:06 2018 + Update translations for support-connecting --- fi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi.json b/fi.json index 4093d10aa..a498133a4

[tor-commits] [translation/support-censorship] Update translations for support-censorship

2018-06-21 Thread translation
commit 534c77bd61178a47bee7701f673d5091a3337aa8 Author: Translation commit bot Date: Thu Jun 21 07:18:58 2018 + Update translations for support-censorship --- fi.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi.json b/fi.json index 886a1a23d..ab2506569

[tor-commits] [tor/master] add a bn.h include to crypto_dh.c

2018-06-21 Thread nickm
commit 599b53f0469e477275d56715ded46b749f5dd06b Author: Nick Mathewson Date: Thu Jun 21 08:34:27 2018 -0400 add a bn.h include to crypto_dh.c --- src/common/crypto_dh.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/common/crypto_dh.c b/src/common/crypto_dh.c

[tor-commits] [tor/maint-0.3.4] Merge branch 'bug25787_squashed' into maint-0.3.4

2018-06-21 Thread nickm
commit e845bd17f8592c8c52fb2f5af31ddd859b22cda5 Merge: 97925322a cacf326e7 Author: Nick Mathewson Date: Thu Jun 21 08:56:27 2018 -0400 Merge branch 'bug25787_squashed' into maint-0.3.4 changes/bug25787 | 7 + src/test/geoip_dummy | 0 src/test/include.am | 1 -

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

2018-06-21 Thread nickm
commit c42071f7503897a8ccdcffabb6bdcff427d77d5e Merge: 349f95017 e845bd17f Author: Nick Mathewson Date: Thu Jun 21 08:59:58 2018 -0400 Merge branch 'maint-0.3.4' changes/bug25787 | 7 + src/test/geoip_dummy | 0 src/test/include.am | 1 - src/test/test_geoip.c | 83

[tor-commits] [tor/master] Merge branch 'bug25787_squashed' into maint-0.3.4

2018-06-21 Thread nickm
commit e845bd17f8592c8c52fb2f5af31ddd859b22cda5 Merge: 97925322a cacf326e7 Author: Nick Mathewson Date: Thu Jun 21 08:56:27 2018 -0400 Merge branch 'bug25787_squashed' into maint-0.3.4 changes/bug25787 | 7 + src/test/geoip_dummy | 0 src/test/include.am | 1 -

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

2018-06-21 Thread nickm
commit e845bd17f8592c8c52fb2f5af31ddd859b22cda5 Merge: 97925322a cacf326e7 Author: Nick Mathewson Date: Thu Jun 21 08:56:27 2018 -0400 Merge branch 'bug25787_squashed' into maint-0.3.4 changes/bug25787 | 7 + src/test/geoip_dummy | 0 src/test/include.am | 1 -

[tor-commits] [tor/release-0.3.4] Revise geoip tests to not require paths of actual geoip config

2018-06-21 Thread nickm
commit cacf326e78bee705d14dd61329160c8d71fa3ef8 Author: Nick Mathewson Date: Mon Jun 11 17:49:38 2018 -0400 Revise geoip tests to not require paths of actual geoip config When I wrote the first one of these, it needed the path of the geoip file. But that doesn't translate

[tor-commits] [tor/maint-0.3.4] Revise geoip tests to not require paths of actual geoip config

2018-06-21 Thread nickm
commit cacf326e78bee705d14dd61329160c8d71fa3ef8 Author: Nick Mathewson Date: Mon Jun 11 17:49:38 2018 -0400 Revise geoip tests to not require paths of actual geoip config When I wrote the first one of these, it needed the path of the geoip file. But that doesn't translate

[tor-commits] [tor/master] Revise geoip tests to not require paths of actual geoip config

2018-06-21 Thread nickm
commit cacf326e78bee705d14dd61329160c8d71fa3ef8 Author: Nick Mathewson Date: Mon Jun 11 17:49:38 2018 -0400 Revise geoip tests to not require paths of actual geoip config When I wrote the first one of these, it needed the path of the geoip file. But that doesn't translate

[tor-commits] [tor-browser-build/master] Bug 26438: Remove seatbelt profiles for macOS

2018-06-21 Thread boklm
commit 767dd879b91584d5828998804ab1ee45499ca640 Author: Georg Koppen Date: Thu Jun 21 07:45:40 2018 + Bug 26438: Remove seatbelt profiles for macOS Starting with content sandboxing being enabled our seatbelt profiles have been broken (see: #22000). We should remove them

[tor-commits] [tor-browser-build/master] Bug 26438: Use non-sandbox background and .DS_Store again

2018-06-21 Thread boklm
commit 8b91968072326cf32da011b2c8bd3bbef14e4ef4 Author: Georg Koppen Date: Thu Jun 21 08:44:02 2018 + Bug 26438: Use non-sandbox background and .DS_Store again --- .../Bundle-Data/mac-applications.dmg/.DS_Store | Bin 12292 -> 12292 bytes

[tor-commits] [tor/master] Rectify include paths (automated)

2018-06-21 Thread nickm
commit da728e36f45799077a8d24a0be95ab5db78593f4 Author: Nick Mathewson Date: Thu Jun 21 09:55:16 2018 -0400 Rectify include paths (automated) --- src/common/crypto_hkdf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/crypto_hkdf.c

[tor-commits] [tor-browser-build/master] Bug 23384: Add user sukhbir on build-sunet-a.torproject.net

2018-06-21 Thread boklm
commit 9638ce481f00edd72e5f307cde29978e66a5d24f Author: Nicolas Vigier Date: Thu Jun 21 15:50:27 2018 +0200 Bug 23384: Add user sukhbir on build-sunet-a.torproject.net --- tools/ansible/roles/tbb-team/defaults/main.yml | 1 + tools/ansible/roles/tbb-team/files/sukhbir.pub | 1 + 2 files

[tor-commits] [translation/tails-greeter-2] Update translations for tails-greeter-2

2018-06-21 Thread translation
commit a0dc3035ef15be6f63fee028b18c9028d1cb0585 Author: Translation commit bot Date: Thu Jun 21 13:48:46 2018 + Update translations for tails-greeter-2 --- fi/fi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fi/fi.po b/fi/fi.po index 274ef5a64..1fe3d4691

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

2018-06-21 Thread translation
commit b1652ae9a6592f0efafaf002117e081572a57295 Author: Translation commit bot Date: Thu Jun 21 13:16:37 2018 + Update translations for tor-launcher-network-settings --- pt/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt/network-settings.dtd

[tor-commits] [tor/master] Merge branch 'mikeperry_bug26214-rebased_squashed'

2018-06-21 Thread nickm
commit 2ad062ee601bc30594b81a33404662fbd59ef8b1 Merge: d46969e82 46b06cd69 Author: Nick Mathewson Date: Thu Jun 21 09:20:03 2018 -0400 Merge branch 'mikeperry_bug26214-rebased_squashed' changes/bug26214 | 3 +++ src/or/or.h | 1 + src/or/relay.c| 24

[tor-commits] [tor/master] Bug 26214: Check stream SENDME against max.

2018-06-21 Thread nickm
commit dc397f9a61e2e2caeea1acd46beab0e7205eaa9f Author: Mike Perry Date: Sun May 27 01:42:35 2018 + Bug 26214: Check stream SENDME against max. --- src/or/or.h| 1 + src/or/relay.c | 24 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git

[tor-commits] [tor/master] Bug 26214: Changes file.

2018-06-21 Thread nickm
commit 11d993869447d08a3fe4ab3b36d34fc53aa21ba1 Author: Mike Perry Date: Sun May 27 01:43:19 2018 + Bug 26214: Changes file. --- changes/bug26214 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug26214 b/changes/bug26214 new file mode 100644 index 0..4277b9c6e

[tor-commits] [tor/master] Bug 26214: Test updates.

2018-06-21 Thread nickm
commit 46b06cd6999439608f4a8a34bb68f6fe6a6311e9 Author: Mike Perry Date: Tue Jun 19 19:53:58 2018 + Bug 26214: Test updates. --- src/test/test_relaycell.c | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/test/test_relaycell.c

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

2018-06-21 Thread nickm
commit 6c38795b7ef0dbe88f188b60e65d6b850946374c Merge: 156e9723b 8b108935b Author: Nick Mathewson Date: Thu Jun 21 08:54:02 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26435 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2018-06-21 Thread nickm
commit 97925322a18d3e21dcad3d44d01b78eab7e50db5 Merge: 73bc86382 8b108935b Author: Nick Mathewson Date: Thu Jun 21 08:54:02 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26435 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.4] Fix changes file for memory leak.

2018-06-21 Thread nickm
commit 8b108935b25fb7421443a070415a677f9dcde325 Author: Nick Mathewson Date: Thu Jun 21 08:53:37 2018 -0400 Fix changes file for memory leak. --- changes/bug26435 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26435 b/changes/bug26435 index

[tor-commits] [tor/master] Fix changes file for memory leak.

2018-06-21 Thread nickm
commit 8b108935b25fb7421443a070415a677f9dcde325 Author: Nick Mathewson Date: Thu Jun 21 08:53:37 2018 -0400 Fix changes file for memory leak. --- changes/bug26435 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26435 b/changes/bug26435 index

[tor-commits] [tor/maint-0.3.4] Fix changes file for memory leak.

2018-06-21 Thread nickm
commit 8b108935b25fb7421443a070415a677f9dcde325 Author: Nick Mathewson Date: Thu Jun 21 08:53:37 2018 -0400 Fix changes file for memory leak. --- changes/bug26435 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26435 b/changes/bug26435 index

[tor-commits] [tor/master] When possible, use RFC5869 HKDF implementation from OpenSSL

2018-06-21 Thread nickm
commit 5af29fbb63eed3517e0d57a04072531347e64515 Author: rl1987 Date: Tue Jun 12 16:21:05 2018 +0300 When possible, use RFC5869 HKDF implementation from OpenSSL Also, stop supporting empty HKDF input key material --- changes/ticket19979 | 3 ++ src/common/crypto_hkdf.c | 96

[tor-commits] [tor/maint-0.3.3] Fix changes file for memory leak.

2018-06-21 Thread nickm
commit 8b108935b25fb7421443a070415a677f9dcde325 Author: Nick Mathewson Date: Thu Jun 21 08:53:37 2018 -0400 Fix changes file for memory leak. --- changes/bug26435 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26435 b/changes/bug26435 index

[tor-commits] [tor/release-0.3.3] Fix changes file for memory leak.

2018-06-21 Thread nickm
commit 8b108935b25fb7421443a070415a677f9dcde325 Author: Nick Mathewson Date: Thu Jun 21 08:53:37 2018 -0400 Fix changes file for memory leak. --- changes/bug26435 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug26435 b/changes/bug26435 index

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

2018-06-21 Thread nickm
commit 97925322a18d3e21dcad3d44d01b78eab7e50db5 Merge: 73bc86382 8b108935b Author: Nick Mathewson Date: Thu Jun 21 08:54:02 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26435 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2018-06-21 Thread nickm
commit 27e456cd72f33bff0e940a337877511ab7e5bb72 Merge: 72a5ae8c6 5af29fbb6 Author: Nick Mathewson Date: Thu Jun 21 08:53:48 2018 -0400 Merge remote-tracking branch 'rl1987/ticket19979_2' changes/ticket19979 | 3 ++ src/common/crypto_hkdf.c | 97

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

2018-06-21 Thread nickm
commit 349f95017c0d146a22980e2729dd0ad42f428bd4 Merge: 27e456cd7 97925322a Author: Nick Mathewson Date: Thu Jun 21 08:54:02 2018 -0400 Merge branch 'maint-0.3.4' changes/bug26435 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

2018-06-21 Thread nickm
commit 97925322a18d3e21dcad3d44d01b78eab7e50db5 Merge: 73bc86382 8b108935b Author: Nick Mathewson Date: Thu Jun 21 08:54:02 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26435 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

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

2018-06-21 Thread nickm
commit c389c4129252b49f7e5bd77e1be342cddbe388fb Merge: 46dca2732 7b1a3c516 Author: Nick Mathewson Date: Thu Jun 21 08:36:48 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26435 | 5 + src/or/protover.c | 9 ++--- 2 files changed, 11 insertions(+), 3

[tor-commits] [tor/maint-0.3.3] fix memory leak in protover.c

2018-06-21 Thread nickm
commit 7b1a3c51644891c4548ccdfd4e8d444cd91b91b0 Author: Roger Dingledine Date: Wed Jun 20 19:43:58 2018 -0400 fix memory leak in protover.c Fix a memory leak where directory authorities would leak a chunk of memory for every router descriptor every time they considered voting.

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

2018-06-21 Thread nickm
commit c389c4129252b49f7e5bd77e1be342cddbe388fb Merge: 46dca2732 7b1a3c516 Author: Nick Mathewson Date: Thu Jun 21 08:36:48 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26435 | 5 + src/or/protover.c | 9 ++--- 2 files changed, 11 insertions(+), 3

[tor-commits] [tor/maint-0.3.4] fix memory leak in protover.c

2018-06-21 Thread nickm
commit 7b1a3c51644891c4548ccdfd4e8d444cd91b91b0 Author: Roger Dingledine Date: Wed Jun 20 19:43:58 2018 -0400 fix memory leak in protover.c Fix a memory leak where directory authorities would leak a chunk of memory for every router descriptor every time they considered voting.

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

2018-06-21 Thread nickm
commit 156e9723bfda28b9cddbc081e80adc75a4c3423e Merge: 8a6e2d5da 7b1a3c516 Author: Nick Mathewson Date: Thu Jun 21 08:36:48 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26435 | 5 + src/or/protover.c | 9 ++--- 2 files changed, 11 insertions(+), 3

[tor-commits] [tor/release-0.3.4] fix memory leak in protover.c

2018-06-21 Thread nickm
commit 7b1a3c51644891c4548ccdfd4e8d444cd91b91b0 Author: Roger Dingledine Date: Wed Jun 20 19:43:58 2018 -0400 fix memory leak in protover.c Fix a memory leak where directory authorities would leak a chunk of memory for every router descriptor every time they considered voting.

[tor-commits] [tor/release-0.3.3] fix memory leak in protover.c

2018-06-21 Thread nickm
commit 7b1a3c51644891c4548ccdfd4e8d444cd91b91b0 Author: Roger Dingledine Date: Wed Jun 20 19:43:58 2018 -0400 fix memory leak in protover.c Fix a memory leak where directory authorities would leak a chunk of memory for every router descriptor every time they considered voting.

[tor-commits] [tor/master] fix memory leak in protover.c

2018-06-21 Thread nickm
commit 7b1a3c51644891c4548ccdfd4e8d444cd91b91b0 Author: Roger Dingledine Date: Wed Jun 20 19:43:58 2018 -0400 fix memory leak in protover.c Fix a memory leak where directory authorities would leak a chunk of memory for every router descriptor every time they considered voting.

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

2018-06-21 Thread nickm
commit 683776bfab21ec48d967d8589412f81c6b39afe6 Merge: 599b53f04 c389c4129 Author: Nick Mathewson Date: Thu Jun 21 08:36:48 2018 -0400 Merge branch 'maint-0.3.4' changes/bug26435 | 5 + src/or/protover.c | 9 ++--- 2 files changed, 11 insertions(+), 3 deletions(-)

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

2018-06-21 Thread nickm
commit c389c4129252b49f7e5bd77e1be342cddbe388fb Merge: 46dca2732 7b1a3c516 Author: Nick Mathewson Date: Thu Jun 21 08:36:48 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26435 | 5 + src/or/protover.c | 9 ++--- 2 files changed, 11 insertions(+), 3

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

2018-06-21 Thread nickm
commit d46969e8208394640d9fe84edbc428329d4ec642 Merge: c42071f75 92ae9bb95 Author: Nick Mathewson Date: Thu Jun 21 09:01:06 2018 -0400 Merge branch 'maint-0.3.4' "Ours" merge to avoid version bump. ___ tor-commits mailing list

[tor-commits] [tor/release-0.3.4] Hang on; this branch is supposed to be 0.3.4.2-alpha-dev.

2018-06-21 Thread nickm
commit 92ae9bb95b6275dfeb28f9aee424c1147365ed4d Author: Nick Mathewson Date: Thu Jun 21 09:01:00 2018 -0400 Hang on; this branch is supposed to be 0.3.4.2-alpha-dev. --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

[tor-commits] [tor/maint-0.3.4] Hang on; this branch is supposed to be 0.3.4.2-alpha-dev.

2018-06-21 Thread nickm
commit 92ae9bb95b6275dfeb28f9aee424c1147365ed4d Author: Nick Mathewson Date: Thu Jun 21 09:01:00 2018 -0400 Hang on; this branch is supposed to be 0.3.4.2-alpha-dev. --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

[tor-commits] [tor/master] Hang on; this branch is supposed to be 0.3.4.2-alpha-dev.

2018-06-21 Thread nickm
commit 92ae9bb95b6275dfeb28f9aee424c1147365ed4d Author: Nick Mathewson Date: Thu Jun 21 09:01:00 2018 -0400 Hang on; this branch is supposed to be 0.3.4.2-alpha-dev. --- configure.ac| 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h

[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed

2018-06-21 Thread translation
commit 78be25b7cfb0fea4dce290ea28628c655e6259b9 Author: Translation commit bot Date: Thu Jun 21 12:15:18 2018 + Update translations for bridgedb_completed --- fi/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fi/LC_MESSAGES/bridgedb.po

[tor-commits] [translation/bridgedb] Update translations for bridgedb

2018-06-21 Thread translation
commit 557c1e18c96c0e6f0b646429fe3eefa5a1ffeed8 Author: Translation commit bot Date: Thu Jun 21 12:15:06 2018 + Update translations for bridgedb --- fi/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fi/LC_MESSAGES/bridgedb.po

[tor-commits] [tor/maint-0.3.4] Use a rust build script to set linker options correctly for tests.

2018-06-21 Thread nickm
commit bd9ebb3763b90a8ef429376ee578e0571371145f Author: Nick Mathewson Date: Mon Jun 18 17:08:23 2018 -0400 Use a rust build script to set linker options correctly for tests. We need this trick because some of our Rust tests depend on our C code, which in turn depend on other

[tor-commits] [tor/maint-0.3.4] Use different RUST_LINKER_OPTIONS for sanitizers

2018-06-21 Thread nickm
commit 6c3ad4cae8b967f6dc9ee98f5b01de9e327e9880 Author: Nick Mathewson Date: Wed Jun 20 17:53:09 2018 -0400 Use different RUST_LINKER_OPTIONS for sanitizers These appear to work for me. --- configure.ac | 19 ++- 1 file changed, 14 insertions(+), 5 deletions(-)

[tor-commits] [tor/maint-0.3.4] Merge branch 'rust_build_script_v3' into additional_rust_test_fixes

2018-06-21 Thread nickm
commit e99ecf939936ed1e8fabbf2f30488d20389ecb7b Merge: 7589fd6d4 bd9ebb376 Author: Nick Mathewson Date: Wed Jun 20 17:07:47 2018 -0400 Merge branch 'rust_build_script_v3' into additional_rust_test_fixes .gitignore | 2 + config.rust.in | 22 ++

[tor-commits] [tor/maint-0.3.4] add build.rs to EXTRA_DIST

2018-06-21 Thread nickm
commit 01d0bf180344b213b3bf43d8e40dc9c8e4990976 Author: Nick Mathewson Date: Wed Jun 20 19:32:01 2018 -0400 add build.rs to EXTRA_DIST --- src/rust/include.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rust/include.am b/src/rust/include.am index 5fd9741e0..5e5b0b3fa 100644

[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.4' into additional_rust_test_fixes

2018-06-21 Thread nickm
commit 3b606ff787967d4f51af79deb8313210e4ca5754 Merge: 6c3ad4cae f91ea506f Author: Nick Mathewson Date: Wed Jun 20 17:53:51 2018 -0400 Merge branch 'maint-0.3.4' into additional_rust_test_fixes src/common/util.c | 5 ++--- src/or/control.c | 5 ++--- src/or/geoip.c| 3 +-- 3 files

[tor-commits] [tor/maint-0.3.4] Allow spaces in CCLD in linker.sh

2018-06-21 Thread nickm
commit e084afde80a844328a1eeef33d732e0f0a0d9eda Author: Nick Mathewson Date: Wed Jun 20 19:16:25 2018 -0400 Allow spaces in CCLD in linker.sh Hello71 spotted this first. --- link_rust.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/link_rust.sh.in

[tor-commits] [tor/master] Use a rust build script to set linker options correctly for tests.

2018-06-21 Thread nickm
commit bd9ebb3763b90a8ef429376ee578e0571371145f Author: Nick Mathewson Date: Mon Jun 18 17:08:23 2018 -0400 Use a rust build script to set linker options correctly for tests. We need this trick because some of our Rust tests depend on our C code, which in turn depend on other

[tor-commits] [tor/maint-0.3.4] Disable doctests in src/rust/crypto module.

2018-06-21 Thread nickm
commit 592e8ac395fc29113774fb15ca0227699d14e080 Author: Nick Mathewson Date: Wed Jun 20 17:16:44 2018 -0400 Disable doctests in src/rust/crypto module. These all need C linking to work, and so far, rustdoc does not seem to respect cargo setting about build scripts or

[tor-commits] [tor/maint-0.3.4] Fix memory leak in CryptoDigest type

2018-06-21 Thread nickm
commit 3a640520996ae45ed32f483432af735187bb7ee5 Author: Nick Mathewson Date: Wed Jun 20 17:28:28 2018 -0400 Fix memory leak in CryptoDigest type If you're owning a C pointer, you need to implement Drop. --- src/rust/external/crypto_digest.rs | 10 +- 1 file changed, 9

[tor-commits] [tor/master] Fix bugs in rust digest tests

2018-06-21 Thread nickm
commit 901ada7e5f5cd98d94c98dac55e471d0a71b740b Author: Nick Mathewson Date: Wed Jun 20 17:08:00 2018 -0400 Fix bugs in rust digest tests --- src/rust/crypto/digests/sha2.rs | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/maint-0.3.4] Fix bugs in rust digest tests

2018-06-21 Thread nickm
commit 901ada7e5f5cd98d94c98dac55e471d0a71b740b Author: Nick Mathewson Date: Wed Jun 20 17:08:00 2018 -0400 Fix bugs in rust digest tests --- src/rust/crypto/digests/sha2.rs | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/maint-0.3.4] Add a leak suppression for backtrace_alloc

2018-06-21 Thread nickm
commit d110f9c9a684e2ab030a65b1366dfb0f037a8279 Author: Nick Mathewson Date: Wed Jun 20 18:02:49 2018 -0400 Add a leak suppression for backtrace_alloc This appears to be an internal rust thing: I don't know why it's leaking. We should investigate further. ---

[tor-commits] [tor/master] add build.rs to EXTRA_DIST

2018-06-21 Thread nickm
commit 01d0bf180344b213b3bf43d8e40dc9c8e4990976 Author: Nick Mathewson Date: Wed Jun 20 19:32:01 2018 -0400 add build.rs to EXTRA_DIST --- src/rust/include.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rust/include.am b/src/rust/include.am index 5fd9741e0..5e5b0b3fa 100644

[tor-commits] [tor/release-0.3.4] Fix memory leak in CryptoDigest type

2018-06-21 Thread nickm
commit 3a640520996ae45ed32f483432af735187bb7ee5 Author: Nick Mathewson Date: Wed Jun 20 17:28:28 2018 -0400 Fix memory leak in CryptoDigest type If you're owning a C pointer, you need to implement Drop. --- src/rust/external/crypto_digest.rs | 10 +- 1 file changed, 9

[tor-commits] [tor/master] Use different RUST_LINKER_OPTIONS for sanitizers

2018-06-21 Thread nickm
commit 6c3ad4cae8b967f6dc9ee98f5b01de9e327e9880 Author: Nick Mathewson Date: Wed Jun 20 17:53:09 2018 -0400 Use different RUST_LINKER_OPTIONS for sanitizers These appear to work for me. --- configure.ac | 19 ++- 1 file changed, 14 insertions(+), 5 deletions(-)

[tor-commits] [tor/master] Add a leak suppression for backtrace_alloc

2018-06-21 Thread nickm
commit d110f9c9a684e2ab030a65b1366dfb0f037a8279 Author: Nick Mathewson Date: Wed Jun 20 18:02:49 2018 -0400 Add a leak suppression for backtrace_alloc This appears to be an internal rust thing: I don't know why it's leaking. We should investigate further. ---

[tor-commits] [tor/master] Merge branch 'maint-0.3.4' into additional_rust_test_fixes

2018-06-21 Thread nickm
commit 3b606ff787967d4f51af79deb8313210e4ca5754 Merge: 6c3ad4cae f91ea506f Author: Nick Mathewson Date: Wed Jun 20 17:53:51 2018 -0400 Merge branch 'maint-0.3.4' into additional_rust_test_fixes src/common/util.c | 5 ++--- src/or/control.c | 5 ++--- src/or/geoip.c| 3 +-- 3 files

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

2018-06-21 Thread nickm
commit 72a5ae8c667fac09a639c46a145c9612424ef301 Merge: 683776bfa 73bc86382 Author: Nick Mathewson Date: Thu Jun 21 08:38:21 2018 -0400 Merge branch 'maint-0.3.4' .gitignore | 2 + config.rust.in | 22 + configure.ac

[tor-commits] [tor/master] Disable doctests in src/rust/crypto module.

2018-06-21 Thread nickm
commit 592e8ac395fc29113774fb15ca0227699d14e080 Author: Nick Mathewson Date: Wed Jun 20 17:16:44 2018 -0400 Disable doctests in src/rust/crypto module. These all need C linking to work, and so far, rustdoc does not seem to respect cargo setting about build scripts or

[tor-commits] [tor/maint-0.3.4] eol@eof is still the law in 0.3.4 :(

2018-06-21 Thread nickm
commit 8f3712cf6e02bb7e7a8ad9570fda3f6904c7d181 Author: Nick Mathewson Date: Wed Jun 20 19:05:11 2018 -0400 eol@eof is still the law in 0.3.4 :( --- src/common/util.c | 1 + src/or/control.c | 1 + src/or/geoip.c| 1 + 3 files changed, 3 insertions(+) diff --git a/src/common/util.c

[tor-commits] [tor/master] Merge branch 'rust_build_script_v3' into additional_rust_test_fixes

2018-06-21 Thread nickm
commit e99ecf939936ed1e8fabbf2f30488d20389ecb7b Merge: 7589fd6d4 bd9ebb376 Author: Nick Mathewson Date: Wed Jun 20 17:07:47 2018 -0400 Merge branch 'rust_build_script_v3' into additional_rust_test_fixes .gitignore | 2 + config.rust.in | 22 ++

[tor-commits] [translation/mat-gui_completed] Update translations for mat-gui_completed

2018-06-21 Thread translation
commit a27f0c00f2fbfb0ac0178075fd9e5e7d1c29a1f5 Author: Translation commit bot Date: Thu Jun 21 13:46:26 2018 + Update translations for mat-gui_completed --- fi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fi.po b/fi.po index 565115504..f9d3b8316 100644

[tor-commits] [translation/mat-gui] Update translations for mat-gui

2018-06-21 Thread translation
commit 4074f5aa7bccd8ad43331a552834cf858d1c9cfd Author: Translation commit bot Date: Thu Jun 21 13:46:21 2018 + Update translations for mat-gui --- fi.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fi.po b/fi.po index 565115504..f9d3b8316 100644 --- a/fi.po

[tor-commits] [tor/master] Merge branch 'additional_rust_test_fixes' into maint-0.3.4

2018-06-21 Thread nickm
commit 73bc863822bc58adaafc4017c25acaff0ecb43c1 Merge: c389c4129 01d0bf180 Author: Nick Mathewson Date: Thu Jun 21 08:38:17 2018 -0400 Merge branch 'additional_rust_test_fixes' into maint-0.3.4 .gitignore | 2 + config.rust.in | 22 +

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

2018-06-21 Thread nickm
commit 73bc863822bc58adaafc4017c25acaff0ecb43c1 Merge: c389c4129 01d0bf180 Author: Nick Mathewson Date: Thu Jun 21 08:38:17 2018 -0400 Merge branch 'additional_rust_test_fixes' into maint-0.3.4 .gitignore | 2 + config.rust.in | 22 +

[tor-commits] [tor/release-0.3.4] Fix bugs in rust digest tests

2018-06-21 Thread nickm
commit 901ada7e5f5cd98d94c98dac55e471d0a71b740b Author: Nick Mathewson Date: Wed Jun 20 17:08:00 2018 -0400 Fix bugs in rust digest tests --- src/rust/crypto/digests/sha2.rs | 15 --- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git

[tor-commits] [tor/release-0.3.4] Disable doctests in src/rust/crypto module.

2018-06-21 Thread nickm
commit 592e8ac395fc29113774fb15ca0227699d14e080 Author: Nick Mathewson Date: Wed Jun 20 17:16:44 2018 -0400 Disable doctests in src/rust/crypto module. These all need C linking to work, and so far, rustdoc does not seem to respect cargo setting about build scripts or

[tor-commits] [tor/master] Fix memory leak in CryptoDigest type

2018-06-21 Thread nickm
commit 3a640520996ae45ed32f483432af735187bb7ee5 Author: Nick Mathewson Date: Wed Jun 20 17:28:28 2018 -0400 Fix memory leak in CryptoDigest type If you're owning a C pointer, you need to implement Drop. --- src/rust/external/crypto_digest.rs | 10 +- 1 file changed, 9

[tor-commits] [tor/release-0.3.4] eol@eof is still the law in 0.3.4 :(

2018-06-21 Thread nickm
commit 8f3712cf6e02bb7e7a8ad9570fda3f6904c7d181 Author: Nick Mathewson Date: Wed Jun 20 19:05:11 2018 -0400 eol@eof is still the law in 0.3.4 :( --- src/common/util.c | 1 + src/or/control.c | 1 + src/or/geoip.c| 1 + 3 files changed, 3 insertions(+) diff --git a/src/common/util.c

[tor-commits] [tor/release-0.3.4] Use a rust build script to set linker options correctly for tests.

2018-06-21 Thread nickm
commit bd9ebb3763b90a8ef429376ee578e0571371145f Author: Nick Mathewson Date: Mon Jun 18 17:08:23 2018 -0400 Use a rust build script to set linker options correctly for tests. We need this trick because some of our Rust tests depend on our C code, which in turn depend on other

[tor-commits] [tor/release-0.3.4] Merge branch 'rust_build_script_v3' into additional_rust_test_fixes

2018-06-21 Thread nickm
commit e99ecf939936ed1e8fabbf2f30488d20389ecb7b Merge: 7589fd6d4 bd9ebb376 Author: Nick Mathewson Date: Wed Jun 20 17:07:47 2018 -0400 Merge branch 'rust_build_script_v3' into additional_rust_test_fixes .gitignore | 2 + config.rust.in | 22 ++

[tor-commits] [tor/master] eol@eof is still the law in 0.3.4 :(

2018-06-21 Thread nickm
commit 8f3712cf6e02bb7e7a8ad9570fda3f6904c7d181 Author: Nick Mathewson Date: Wed Jun 20 19:05:11 2018 -0400 eol@eof is still the law in 0.3.4 :( --- src/common/util.c | 1 + src/or/control.c | 1 + src/or/geoip.c| 1 + 3 files changed, 3 insertions(+) diff --git a/src/common/util.c

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

2018-06-21 Thread nickm
commit 3b606ff787967d4f51af79deb8313210e4ca5754 Merge: 6c3ad4cae f91ea506f Author: Nick Mathewson Date: Wed Jun 20 17:53:51 2018 -0400 Merge branch 'maint-0.3.4' into additional_rust_test_fixes src/common/util.c | 5 ++--- src/or/control.c | 5 ++--- src/or/geoip.c| 3 +-- 3 files

[tor-commits] [tor/release-0.3.4] Allow spaces in CCLD in linker.sh

2018-06-21 Thread nickm
commit e084afde80a844328a1eeef33d732e0f0a0d9eda Author: Nick Mathewson Date: Wed Jun 20 19:16:25 2018 -0400 Allow spaces in CCLD in linker.sh Hello71 spotted this first. --- link_rust.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/link_rust.sh.in

[tor-commits] [tor/release-0.3.4] Add a leak suppression for backtrace_alloc

2018-06-21 Thread nickm
commit d110f9c9a684e2ab030a65b1366dfb0f037a8279 Author: Nick Mathewson Date: Wed Jun 20 18:02:49 2018 -0400 Add a leak suppression for backtrace_alloc This appears to be an internal rust thing: I don't know why it's leaking. We should investigate further. ---

[tor-commits] [tor/release-0.3.4] add build.rs to EXTRA_DIST

2018-06-21 Thread nickm
commit 01d0bf180344b213b3bf43d8e40dc9c8e4990976 Author: Nick Mathewson Date: Wed Jun 20 19:32:01 2018 -0400 add build.rs to EXTRA_DIST --- src/rust/include.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rust/include.am b/src/rust/include.am index 5fd9741e0..5e5b0b3fa 100644

[tor-commits] [tor/master] Allow spaces in CCLD in linker.sh

2018-06-21 Thread nickm
commit e084afde80a844328a1eeef33d732e0f0a0d9eda Author: Nick Mathewson Date: Wed Jun 20 19:16:25 2018 -0400 Allow spaces in CCLD in linker.sh Hello71 spotted this first. --- link_rust.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/link_rust.sh.in

[tor-commits] [tor/release-0.3.4] Use different RUST_LINKER_OPTIONS for sanitizers

2018-06-21 Thread nickm
commit 6c3ad4cae8b967f6dc9ee98f5b01de9e327e9880 Author: Nick Mathewson Date: Wed Jun 20 17:53:09 2018 -0400 Use different RUST_LINKER_OPTIONS for sanitizers These appear to work for me. --- configure.ac | 19 ++- 1 file changed, 14 insertions(+), 5 deletions(-)

[tor-commits] [tor/master] Fix distcheck by naming header properly.

2018-06-21 Thread nickm
commit 874ba6861a02401f4f2d6d2f0e5bdf806386f50b Author: Nick Mathewson Date: Thu Jun 21 09:37:32 2018 -0400 Fix distcheck by naming header properly. --- src/common/include.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/include.am b/src/common/include.am

[tor-commits] [tor/master] di_ops.c does not actually log anything.

2018-06-21 Thread nickm
commit 68bbe915d909ba56a50a6d595eb6271967126a0e Author: Nick Mathewson Date: Thu Jun 21 12:28:33 2018 -0400 di_ops.c does not actually log anything. --- src/lib/ctime/di_ops.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/lib/ctime/di_ops.c b/src/lib/ctime/di_ops.c index

[tor-commits] [tor/master] Move trace into its own library in libs.

2018-06-21 Thread nickm
commit 4bdda6d05faf24b4ff46bfcb7e40fb5d21e51259 Author: Nick Mathewson Date: Thu Jun 21 12:02:14 2018 -0400 Move trace into its own library in libs. Apparently it has no testing variant. --- .gitignore | 1 + Makefile.am | 4 ++--

[tor-commits] [tor/master] Rectify include paths (automated)

2018-06-21 Thread nickm
commit fa5fda5bbfd1c3ebcd9f01d0d86509c68dfd4268 Author: Nick Mathewson Date: Thu Jun 21 12:20:52 2018 -0400 Rectify include paths (automated) --- src/common/address.h| 2 +- src/common/address_set.h| 2 +- src/common/buffers.c

[tor-commits] [tor/master] Rectify include paths (automated)

2018-06-21 Thread nickm
commit accf239fa3e84451711a25a96ddb13877fd9fcfa Author: Nick Mathewson Date: Thu Jun 21 12:47:11 2018 -0400 Rectify include paths (automated) --- src/common/address_set.c | 2 +- src/common/compat_libevent.c | 2 +- src/common/container.c

[tor-commits] [tor/master] Remove unused pubsub module.

2018-06-21 Thread nickm
commit d2f4a716e8cc9aaa53b36d4e853769103ea35084 Author: Nick Mathewson Date: Thu Jun 21 12:12:56 2018 -0400 Remove unused pubsub module. --- src/common/include.am | 2 - src/common/pubsub.c| 129 --- src/common/pubsub.h| 179

[tor-commits] [tor/master] Rectify include paths (automated)

2018-06-21 Thread nickm
commit b420da4cf80e9fc53db0a085514b9491b750812f Author: Nick Mathewson Date: Thu Jun 21 11:52:01 2018 -0400 Rectify include paths (automated) --- src/common/buffers.c | 2 +- src/common/buffers_tls.c | 2 +- src/lib/compress/compress.c | 10 +-

[tor-commits] [tor/master] Rectify include paths (automated).

2018-06-21 Thread nickm
commit 3305ae50442aaed13a9e15c392439c348e6182be Author: Nick Mathewson Date: Thu Jun 21 13:12:23 2018 -0400 Rectify include paths (automated). You have no idea how glad I am that this is automated. --- src/common/buffers.h | 2 +- src/common/compat.h

[tor-commits] [tor/master] Move responsibility for libdonna out of src/common

2018-06-21 Thread nickm
commit e9943d5459c30a7dba8fa99c7f1537e3ab208749 Author: Nick Mathewson Date: Thu Jun 21 13:04:09 2018 -0400 Move responsibility for libdonna out of src/common --- .gitignore | 3 +-- src/common/include.am | 25 - src/include.am

[tor-commits] [tor/master] Additional non-automated change to trunnel-local.h

2018-06-21 Thread nickm
commit 71571e34283d071b15fce62bce49f0a268f53cd6 Author: Nick Mathewson Date: Thu Jun 21 12:47:48 2018 -0400 Additional non-automated change to trunnel-local.h --- src/trunnel/trunnel-local.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/trunnel/trunnel-local.h

[tor-commits] [tor/master] Split crypto and tls libraries into directories

2018-06-21 Thread nickm
commit 25ccfff86a5b29c9c1ec9b3d01fe1dc796e9afa0 Author: Nick Mathewson Date: Thu Jun 21 12:46:11 2018 -0400 Split crypto and tls libraries into directories I am calling the crypto library "crypt_ops", since I want higher-level crypto things to be separated from lower-level

[tor-commits] [tor/master] Move more compiler-compatibility stuff into compat_compiler.h

2018-06-21 Thread nickm
commit 49d7c9ce53daa13daae59eedceb07d28e06e4395 Author: Nick Mathewson Date: Thu Jun 21 12:29:34 2018 -0400 Move more compiler-compatibility stuff into compat_compiler.h --- src/common/compat.h | 48 src/include.am | 1 +

[tor-commits] [tor/master] Move compiler-compatibility headers into their own module

2018-06-21 Thread nickm
commit cd8f91955366719d5060264a613c3296b888ec6d Author: Nick Mathewson Date: Thu Jun 21 12:20:26 2018 -0400 Move compiler-compatibility headers into their own module This one has no generated code. --- src/common/include.am| 2 -- src/{common =>

  1   2   >