[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug25981'

2018-05-10 Thread nickm
commit 75e5b778e10cbc6caa4e4902e288a0c63f92ce06 Merge: 382beb93c 8b1380cbd Author: Nick Mathewson Date: Thu May 10 19:31:11 2018 -0400 Merge remote-tracking branch 'public/bug25981' src/or/main.c | 5 + 1 file changed, 5 insertions(+)

[tor-commits] [tor/master] Don't crash when closing a connection before initializing libevent

2018-05-10 Thread nickm
commit 8b1380cbd08f40dc2abee171a390df6d04e999d1 Author: Nick Mathewson Date: Mon May 7 14:30:30 2018 -0400 Don't crash when closing a connection before initializing libevent Fixes bug 25981; bugfix on 96c5ac338a7df. Bug not in any released version of

[tor-commits] [doctor/master] Use new methods to reference diretories

2018-05-10 Thread atagar
commit 49cce6ce032d36c35f65a43ad17efe01a5d403a1 Author: Damian Johnson Date: Thu May 10 12:51:21 2018 -0700 Use new methods to reference diretories Using stem's new stem.directory module rather than the deprecated aliases. --- consensus_health_checker.py |

[tor-commits] [doctor/master] Track expiring approved-routers.conf entries from 2016-01 to 2018-01

2018-05-10 Thread atagar
commit 7ffb7869438babe6fc2aa8b8b3e0f6cfc10b7f5a Author: David Goulet Date: Tue May 8 16:18:46 2018 -0400 Track expiring approved-routers.conf entries from 2016-01 to 2018-01 This adds the fingerprint entries from approved-routers.conf. 3 months expiry

[tor-commits] [doctor/master] Track expiring bad.conf entries from 2016-01 to 2018-01

2018-05-10 Thread atagar
commit c29bba1efb92927b975cd863bb4f437792947a67 Author: David Goulet Date: Tue May 8 16:15:56 2018 -0400 Track expiring bad.conf entries from 2016-01 to 2018-01 This only adds the IP address from bad.conf. 3 months expiry date has been set for those.

[tor-commits] [stem/master] Timeout support in controller methods that await something

2018-05-10 Thread atagar
commit 8a065f42952c9dc9762eaebe4d3fa48210783998 Author: Damian Johnson Date: Thu May 10 12:39:29 2018 -0700 Timeout support in controller methods that await something Adding a timeout argument to all controller methods with an 'await' option.

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

2018-05-10 Thread translation
commit d0a2630acaeec1d4efafe0dcd083e44fac4d25f2 Author: Translation commit bot Date: Thu May 10 14:19:06 2018 + Update translations for support-connecting --- pt_BR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR.json

[tor-commits] [translation/tor-browser-manual] Update translations for tor-browser-manual

2018-05-10 Thread translation
commit 55efc3b70ea7ea86f5d1964845e0bfeb1f45a477 Author: Translation commit bot Date: Thu May 10 14:18:46 2018 + Update translations for tor-browser-manual --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_BR/pt_BR.po

[tor-commits] [translation/tor-browser-manual_completed] Update translations for tor-browser-manual_completed

2018-05-10 Thread translation
commit dc7f76909ed0979680de3b63b62d451f16dff2b5 Author: Translation commit bot Date: Thu May 10 14:18:54 2018 + Update translations for tor-browser-manual_completed --- pt_BR/pt_BR.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2018-05-10 Thread translation
commit e16d064e010e398cd66e039fa170556e27dd2fe7 Author: Translation commit bot Date: Thu May 10 13:49:44 2018 + Update translations for support-tbb --- id.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/id.json b/id.json index

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

2018-05-10 Thread nickm
commit b343ba90604de524b5fa7d87a6daf76fcc118adb Merge: f64fa6b19 7ee67c47f Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6

[tor-commits] [tor/release-0.3.1] hs-v3: Add an extra white-space when parsing descriptor

2018-05-10 Thread nickm
commit 6e99286d45be482effe47feb057948b98495a49f Author: David Goulet Date: Thu May 10 09:16:50 2018 -0400 hs-v3: Add an extra white-space when parsing descriptor The specification describes the signature token to be right after a newline (\n) then the

[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1

2018-05-10 Thread nickm
commit 2d61a83513d4537735843f50c1766c224dd86183 Merge: ba7043921 6e99286d4 Author: Nick Mathewson Date: Thu May 10 09:22:14 2018 -0400 Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1 changes/bug26069 | 5 + src/or/hs_descriptor.c |

[tor-commits] [tor/release-0.3.3] hs-v3: Add an extra white-space when parsing descriptor

2018-05-10 Thread nickm
commit 6e99286d45be482effe47feb057948b98495a49f Author: David Goulet Date: Thu May 10 09:16:50 2018 -0400 hs-v3: Add an extra white-space when parsing descriptor The specification describes the signature token to be right after a newline (\n) then the

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

2018-05-10 Thread nickm
commit d47da400584900193d61d8feaf874a0ff2abec13 Merge: 5fd8f3b71 2d61a8351 Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6

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

2018-05-10 Thread nickm
commit 7ee67c47fae2263e8c4f5599e0fbba6531738120 Merge: 15b8c860d 2d61a8351 Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-05-10 Thread nickm
commit 7ee67c47fae2263e8c4f5599e0fbba6531738120 Merge: 15b8c860d 2d61a8351 Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1

2018-05-10 Thread nickm
commit 2d61a83513d4537735843f50c1766c224dd86183 Merge: ba7043921 6e99286d4 Author: Nick Mathewson Date: Thu May 10 09:22:14 2018 -0400 Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1 changes/bug26069 | 5 + src/or/hs_descriptor.c |

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1

2018-05-10 Thread nickm
commit 2d61a83513d4537735843f50c1766c224dd86183 Merge: ba7043921 6e99286d4 Author: Nick Mathewson Date: Thu May 10 09:22:14 2018 -0400 Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1 changes/bug26069 | 5 + src/or/hs_descriptor.c |

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

2018-05-10 Thread nickm
commit 1118536142d03ab3e3958788c9bedd354b9fc8fa Merge: f36fea697 b343ba906 Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6

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

2018-05-10 Thread nickm
commit 382beb93cb4110b2bcc82ab69c8e72c274a51ca2 Merge: 2eff709ed b343ba906 Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.3' changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6 insertions(+), 1

[tor-commits] [tor/release-0.3.2] hs-v3: Add an extra white-space when parsing descriptor

2018-05-10 Thread nickm
commit 6e99286d45be482effe47feb057948b98495a49f Author: David Goulet Date: Thu May 10 09:16:50 2018 -0400 hs-v3: Add an extra white-space when parsing descriptor The specification describes the signature token to be right after a newline (\n) then the

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

2018-05-10 Thread nickm
commit e935e2767676d86d9b36b6aafb439075a71feab0 Merge: 34d418009 7ee67c47f Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6

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

2018-05-10 Thread nickm
commit b343ba90604de524b5fa7d87a6daf76fcc118adb Merge: f64fa6b19 7ee67c47f Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1

2018-05-10 Thread nickm
commit 2d61a83513d4537735843f50c1766c224dd86183 Merge: ba7043921 6e99286d4 Author: Nick Mathewson Date: Thu May 10 09:22:14 2018 -0400 Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1 changes/bug26069 | 5 + src/or/hs_descriptor.c |

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

2018-05-10 Thread nickm
commit 7ee67c47fae2263e8c4f5599e0fbba6531738120 Merge: 15b8c860d 2d61a8351 Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6

[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1

2018-05-10 Thread nickm
commit 2d61a83513d4537735843f50c1766c224dd86183 Merge: ba7043921 6e99286d4 Author: Nick Mathewson Date: Thu May 10 09:22:14 2018 -0400 Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1 changes/bug26069 | 5 + src/or/hs_descriptor.c |

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1

2018-05-10 Thread nickm
commit 2d61a83513d4537735843f50c1766c224dd86183 Merge: ba7043921 6e99286d4 Author: Nick Mathewson Date: Thu May 10 09:22:14 2018 -0400 Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1 changes/bug26069 | 5 + src/or/hs_descriptor.c |

[tor-commits] [tor/maint-0.3.1] hs-v3: Add an extra white-space when parsing descriptor

2018-05-10 Thread nickm
commit 6e99286d45be482effe47feb057948b98495a49f Author: David Goulet Date: Thu May 10 09:16:50 2018 -0400 hs-v3: Add an extra white-space when parsing descriptor The specification describes the signature token to be right after a newline (\n) then the

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

2018-05-10 Thread nickm
commit 7ee67c47fae2263e8c4f5599e0fbba6531738120 Merge: 15b8c860d 2d61a8351 Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6

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

2018-05-10 Thread nickm
commit b343ba90604de524b5fa7d87a6daf76fcc118adb Merge: f64fa6b19 7ee67c47f Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6

[tor-commits] [tor/master] hs-v3: Add an extra white-space when parsing descriptor

2018-05-10 Thread nickm
commit 6e99286d45be482effe47feb057948b98495a49f Author: David Goulet Date: Thu May 10 09:16:50 2018 -0400 hs-v3: Add an extra white-space when parsing descriptor The specification describes the signature token to be right after a newline (\n) then the

[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1

2018-05-10 Thread nickm
commit 2d61a83513d4537735843f50c1766c224dd86183 Merge: ba7043921 6e99286d4 Author: Nick Mathewson Date: Thu May 10 09:22:14 2018 -0400 Merge remote-tracking branch 'dgoulet/bug26069_031_01' into maint-0.3.1 changes/bug26069 | 5 + src/or/hs_descriptor.c |

[tor-commits] [tor/maint-0.3.2] hs-v3: Add an extra white-space when parsing descriptor

2018-05-10 Thread nickm
commit 6e99286d45be482effe47feb057948b98495a49f Author: David Goulet Date: Thu May 10 09:16:50 2018 -0400 hs-v3: Add an extra white-space when parsing descriptor The specification describes the signature token to be right after a newline (\n) then the

[tor-commits] [tor/maint-0.3.3] hs-v3: Add an extra white-space when parsing descriptor

2018-05-10 Thread nickm
commit 6e99286d45be482effe47feb057948b98495a49f Author: David Goulet Date: Thu May 10 09:16:50 2018 -0400 hs-v3: Add an extra white-space when parsing descriptor The specification describes the signature token to be right after a newline (\n) then the

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

2018-05-10 Thread nickm
commit 34d418009d99931000870b535222e901ace52c1f Merge: a15009bd3 15b8c860d Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.2' into release-0.3.2 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

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

2018-05-10 Thread nickm
commit ba70439210c57b0e0e60b07f116f101725085d85 Merge: aa08c1970 edb6acf9c Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9

2018-05-10 Thread nickm
commit edb6acf9cee42406cfa8380c898b7b664f699b8d Merge: bca8a104b dbdde76f5 Author: Nick Mathewson Date: Thu May 10 09:19:09 2018 -0400 Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9 src/test/test_dir.c | 20 1 file

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-05-10 Thread nickm
commit 7ee67c47fae2263e8c4f5599e0fbba6531738120 Merge: 15b8c860d 2d61a8351 Author: Nick Mathewson Date: Thu May 10 09:22:32 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug26069 | 5 + src/or/hs_descriptor.c | 2 +- 2 files changed, 6

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

2018-05-10 Thread nickm
commit 5fd8f3b71d5c0d8dc9827d107215af91ecae4d78 Merge: 9ca9e6a1f ba7043921 Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

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

2018-05-10 Thread nickm
commit 15b8c860d3c8eac8f560569a90e90ba517e1c6ae Merge: e5acbbd16 ba7043921 Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

[tor-commits] [tor/release-0.3.2] Test read bandwidth measurements with empty file

2018-05-10 Thread nickm
commit dbdde76f56d0ecb2ef03ac6ec231151016ffbd88 Author: juga0 Date: Tue May 8 16:23:37 2018 + Test read bandwidth measurements with empty file --- src/test/test_dir.c | 20 1 file changed, 20 insertions(+) diff --git a/src/test/test_dir.c

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

2018-05-10 Thread nickm
commit ba70439210c57b0e0e60b07f116f101725085d85 Merge: aa08c1970 edb6acf9c Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

[tor-commits] [tor/release-0.3.1] Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9

2018-05-10 Thread nickm
commit edb6acf9cee42406cfa8380c898b7b664f699b8d Merge: bca8a104b dbdde76f5 Author: Nick Mathewson Date: Thu May 10 09:19:09 2018 -0400 Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9 src/test/test_dir.c | 20 1 file

[tor-commits] [tor/release-0.3.3] Test read bandwidth measurements with empty file

2018-05-10 Thread nickm
commit dbdde76f56d0ecb2ef03ac6ec231151016ffbd88 Author: juga0 Date: Tue May 8 16:23:37 2018 + Test read bandwidth measurements with empty file --- src/test/test_dir.c | 20 1 file changed, 20 insertions(+) diff --git a/src/test/test_dir.c

[tor-commits] [tor/release-0.3.3] Stop logging stack contents when reading a zero-length bandwidth file

2018-05-10 Thread nickm
commit 867fe40f91b849393b56109586d85e499a53a142 Author: teor Date: Wed May 2 22:33:21 2018 +1000 Stop logging stack contents when reading a zero-length bandwidth file When directory authorities read a zero-byte bandwidth file, they log a warning with the

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

2018-05-10 Thread nickm
commit f64fa6b19ec7663f47e600599761fadbde4135e9 Merge: 59812789f 15b8c860d Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

[tor-commits] [tor/release-0.3.1] Stop logging stack contents when reading a zero-length bandwidth file

2018-05-10 Thread nickm
commit 867fe40f91b849393b56109586d85e499a53a142 Author: teor Date: Wed May 2 22:33:21 2018 +1000 Stop logging stack contents when reading a zero-length bandwidth file When directory authorities read a zero-byte bandwidth file, they log a warning with the

[tor-commits] [tor/release-0.3.1] Test read bandwidth measurements with empty file

2018-05-10 Thread nickm
commit dbdde76f56d0ecb2ef03ac6ec231151016ffbd88 Author: juga0 Date: Tue May 8 16:23:37 2018 + Test read bandwidth measurements with empty file --- src/test/test_dir.c | 20 1 file changed, 20 insertions(+) diff --git a/src/test/test_dir.c

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

2018-05-10 Thread nickm
commit ba70439210c57b0e0e60b07f116f101725085d85 Merge: aa08c1970 edb6acf9c Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

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

2018-05-10 Thread nickm
commit f64fa6b19ec7663f47e600599761fadbde4135e9 Merge: 59812789f 15b8c860d Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

[tor-commits] [tor/release-0.2.9] Stop logging stack contents when reading a zero-length bandwidth file

2018-05-10 Thread nickm
commit 867fe40f91b849393b56109586d85e499a53a142 Author: teor Date: Wed May 2 22:33:21 2018 +1000 Stop logging stack contents when reading a zero-length bandwidth file When directory authorities read a zero-byte bandwidth file, they log a warning with the

[tor-commits] [tor/release-0.3.2] Stop logging stack contents when reading a zero-length bandwidth file

2018-05-10 Thread nickm
commit 867fe40f91b849393b56109586d85e499a53a142 Author: teor Date: Wed May 2 22:33:21 2018 +1000 Stop logging stack contents when reading a zero-length bandwidth file When directory authorities read a zero-byte bandwidth file, they log a warning with the

[tor-commits] [tor/release-0.3.3] Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9

2018-05-10 Thread nickm
commit edb6acf9cee42406cfa8380c898b7b664f699b8d Merge: bca8a104b dbdde76f5 Author: Nick Mathewson Date: Thu May 10 09:19:09 2018 -0400 Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9 src/test/test_dir.c | 20 1 file

[tor-commits] [tor/release-0.2.9] Test read bandwidth measurements with empty file

2018-05-10 Thread nickm
commit dbdde76f56d0ecb2ef03ac6ec231151016ffbd88 Author: juga0 Date: Tue May 8 16:23:37 2018 + Test read bandwidth measurements with empty file --- src/test/test_dir.c | 20 1 file changed, 20 insertions(+) diff --git a/src/test/test_dir.c

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

2018-05-10 Thread nickm
commit f36fea697eb480d9e67cfbd69b122427802fea85 Merge: 62b224f72 f64fa6b19 Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

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

2018-05-10 Thread nickm
commit ba70439210c57b0e0e60b07f116f101725085d85 Merge: aa08c1970 edb6acf9c Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

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

2018-05-10 Thread nickm
commit 15b8c860d3c8eac8f560569a90e90ba517e1c6ae Merge: e5acbbd16 ba7043921 Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

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

2018-05-10 Thread nickm
commit ba70439210c57b0e0e60b07f116f101725085d85 Merge: aa08c1970 edb6acf9c Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9

2018-05-10 Thread nickm
commit edb6acf9cee42406cfa8380c898b7b664f699b8d Merge: bca8a104b dbdde76f5 Author: Nick Mathewson Date: Thu May 10 09:19:09 2018 -0400 Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9 src/test/test_dir.c | 20 1 file

[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-05-10 Thread nickm
commit 15b8c860d3c8eac8f560569a90e90ba517e1c6ae Merge: e5acbbd16 ba7043921 Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

[tor-commits] [tor/maint-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2018-05-10 Thread nickm
commit 15b8c860d3c8eac8f560569a90e90ba517e1c6ae Merge: e5acbbd16 ba7043921 Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

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

2018-05-10 Thread nickm
commit ba70439210c57b0e0e60b07f116f101725085d85 Merge: aa08c1970 edb6acf9c Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

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

2018-05-10 Thread nickm
commit a1c06b84b31cbc1c7e0f57928de66d9d1159ce4a Merge: 52bb38868 edb6acf9c Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

[tor-commits] [tor/master] Test read bandwidth measurements with empty file

2018-05-10 Thread nickm
commit dbdde76f56d0ecb2ef03ac6ec231151016ffbd88 Author: juga0 Date: Tue May 8 16:23:37 2018 + Test read bandwidth measurements with empty file --- src/test/test_dir.c | 20 1 file changed, 20 insertions(+) diff --git a/src/test/test_dir.c

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9

2018-05-10 Thread nickm
commit edb6acf9cee42406cfa8380c898b7b664f699b8d Merge: bca8a104b dbdde76f5 Author: Nick Mathewson Date: Thu May 10 09:19:09 2018 -0400 Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9 src/test/test_dir.c | 20 1 file

[tor-commits] [tor/release-0.2.9] Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9

2018-05-10 Thread nickm
commit edb6acf9cee42406cfa8380c898b7b664f699b8d Merge: bca8a104b dbdde76f5 Author: Nick Mathewson Date: Thu May 10 09:19:09 2018 -0400 Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9 src/test/test_dir.c | 20 1 file

[tor-commits] [tor/maint-0.3.3] Stop logging stack contents when reading a zero-length bandwidth file

2018-05-10 Thread nickm
commit 867fe40f91b849393b56109586d85e499a53a142 Author: teor Date: Wed May 2 22:33:21 2018 +1000 Stop logging stack contents when reading a zero-length bandwidth file When directory authorities read a zero-byte bandwidth file, they log a warning with the

[tor-commits] [tor/maint-0.3.3] Test read bandwidth measurements with empty file

2018-05-10 Thread nickm
commit dbdde76f56d0ecb2ef03ac6ec231151016ffbd88 Author: juga0 Date: Tue May 8 16:23:37 2018 + Test read bandwidth measurements with empty file --- src/test/test_dir.c | 20 1 file changed, 20 insertions(+) diff --git a/src/test/test_dir.c

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

2018-05-10 Thread nickm
commit 15b8c860d3c8eac8f560569a90e90ba517e1c6ae Merge: e5acbbd16 ba7043921 Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.1' into maint-0.3.2 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

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

2018-05-10 Thread nickm
commit f64fa6b19ec7663f47e600599761fadbde4135e9 Merge: 59812789f 15b8c860d Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

[tor-commits] [tor/maint-0.3.2] Test read bandwidth measurements with empty file

2018-05-10 Thread nickm
commit dbdde76f56d0ecb2ef03ac6ec231151016ffbd88 Author: juga0 Date: Tue May 8 16:23:37 2018 + Test read bandwidth measurements with empty file --- src/test/test_dir.c | 20 1 file changed, 20 insertions(+) diff --git a/src/test/test_dir.c

[tor-commits] [tor/master] Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9

2018-05-10 Thread nickm
commit edb6acf9cee42406cfa8380c898b7b664f699b8d Merge: bca8a104b dbdde76f5 Author: Nick Mathewson Date: Thu May 10 09:19:09 2018 -0400 Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9 src/test/test_dir.c | 20 1 file

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

2018-05-10 Thread nickm
commit 2eff709edb52e2bf6565dd8d00d7f2b79a05e60c Merge: 1eede00a4 f64fa6b19 Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.3.3' src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

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

2018-05-10 Thread nickm
commit ba70439210c57b0e0e60b07f116f101725085d85 Merge: aa08c1970 edb6acf9c Author: Nick Mathewson Date: Thu May 10 09:19:28 2018 -0400 Merge branch 'maint-0.2.9' into maint-0.3.1 src/test/test_dir.c | 20 1 file changed, 20 insertions(+)

[tor-commits] [tor/maint-0.3.2] Stop logging stack contents when reading a zero-length bandwidth file

2018-05-10 Thread nickm
commit 867fe40f91b849393b56109586d85e499a53a142 Author: teor Date: Wed May 2 22:33:21 2018 +1000 Stop logging stack contents when reading a zero-length bandwidth file When directory authorities read a zero-byte bandwidth file, they log a warning with the

[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9

2018-05-10 Thread nickm
commit edb6acf9cee42406cfa8380c898b7b664f699b8d Merge: bca8a104b dbdde76f5 Author: Nick Mathewson Date: Thu May 10 09:19:09 2018 -0400 Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9 src/test/test_dir.c | 20 1 file

[tor-commits] [tor/maint-0.3.1] Stop logging stack contents when reading a zero-length bandwidth file

2018-05-10 Thread nickm
commit 867fe40f91b849393b56109586d85e499a53a142 Author: teor Date: Wed May 2 22:33:21 2018 +1000 Stop logging stack contents when reading a zero-length bandwidth file When directory authorities read a zero-byte bandwidth file, they log a warning with the

[tor-commits] [tor/maint-0.2.9] Test read bandwidth measurements with empty file

2018-05-10 Thread nickm
commit dbdde76f56d0ecb2ef03ac6ec231151016ffbd88 Author: juga0 Date: Tue May 8 16:23:37 2018 + Test read bandwidth measurements with empty file --- src/test/test_dir.c | 20 1 file changed, 20 insertions(+) diff --git a/src/test/test_dir.c

[tor-commits] [tor/master] Stop logging stack contents when reading a zero-length bandwidth file

2018-05-10 Thread nickm
commit 867fe40f91b849393b56109586d85e499a53a142 Author: teor Date: Wed May 2 22:33:21 2018 +1000 Stop logging stack contents when reading a zero-length bandwidth file When directory authorities read a zero-byte bandwidth file, they log a warning with the

[tor-commits] [tor/maint-0.2.9] Stop logging stack contents when reading a zero-length bandwidth file

2018-05-10 Thread nickm
commit 867fe40f91b849393b56109586d85e499a53a142 Author: teor Date: Wed May 2 22:33:21 2018 +1000 Stop logging stack contents when reading a zero-length bandwidth file When directory authorities read a zero-byte bandwidth file, they log a warning with the

[tor-commits] [tor/maint-0.3.1] Test read bandwidth measurements with empty file

2018-05-10 Thread nickm
commit dbdde76f56d0ecb2ef03ac6ec231151016ffbd88 Author: juga0 Date: Tue May 8 16:23:37 2018 + Test read bandwidth measurements with empty file --- src/test/test_dir.c | 20 1 file changed, 20 insertions(+) diff --git a/src/test/test_dir.c

[tor-commits] [tor/maint-0.2.9] Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9

2018-05-10 Thread nickm
commit edb6acf9cee42406cfa8380c898b7b664f699b8d Merge: bca8a104b dbdde76f5 Author: Nick Mathewson Date: Thu May 10 09:19:09 2018 -0400 Merge remote-tracking branch 'juga/ticket26007_029_02' into maint-0.2.9 src/test/test_dir.c | 20 1 file

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

2018-05-10 Thread translation
commit f13706138b2571980683b8009e10cbbae8dcb2c4 Author: Translation commit bot Date: Thu May 10 13:19:28 2018 + Update translations for support-tbb --- id.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id.json b/id.json index

[tor-commits] [tor/master] Add a new function to enable/disable the per-second timer as needed

2018-05-10 Thread nickm
commit e722bba263e6c4648fff4259a14677993697337c Author: Nick Mathewson Date: Wed May 9 12:40:45 2018 -0400 Add a new function to enable/disable the per-second timer as needed We're about to use this to turn off the per-second timer when the network is

[tor-commits] [tor/master] Remove a workaround for ancient libevent versions.

2018-05-10 Thread nickm
commit 4218511ecd8a1facbd38d744b1bd518c05517988 Author: Nick Mathewson Date: Wed May 9 12:38:50 2018 -0400 Remove a workaround for ancient libevent versions. Libevent has accepted a const timeval argument to event_add() for a very long time now. ---

[tor-commits] [tor/master] Merge branch 'ticket26063_squashed'

2018-05-10 Thread nickm
commit 1eede00a4bd9a7de2acf77393f2fc57aa3196d08 Merge: beca6a585 8b4cf7771 Author: Nick Mathewson Date: Thu May 10 09:13:28 2018 -0400 Merge branch 'ticket26063_squashed' changes/ticket26063 | 5 +++ src/common/compat_libevent.c | 31 ++-

[tor-commits] [tor/master] Enable/disable per-second callback as needed.

2018-05-10 Thread nickm
commit 8b4cf7771e869bea4550452ad2cf5634278e0e87 Author: Nick Mathewson Date: Wed May 9 12:47:59 2018 -0400 Enable/disable per-second callback as needed. There are three cases where this can happen: changes in our controller events, changes in our

[tor-commits] [tor/master] Use net_is_completely_disabled() in connection.c

2018-05-10 Thread nickm
commit fa7847e450ee9884eda6236b50ea0d59db3efaba Author: Nick Mathewson Date: Wed May 9 12:26:50 2018 -0400 Use net_is_completely_disabled() in connection.c This fixes the case that we had before, and also enforces the rule that we won't open

[tor-commits] [tor/master] Give control.c responsibility for its own once-a-second events

2018-05-10 Thread nickm
commit 0c19ce7bdece5906e035e71d3fb682632c8bb9cb Author: Nick Mathewson Date: Mon May 7 17:41:54 2018 -0400 Give control.c responsibility for its own once-a-second events Now it has a function that can tell the rest of Tor whether any once-a-second

[tor-commits] [tor/master] Comment-only fix: annotate we_are_hibernating() usage

2018-05-10 Thread nickm
commit c0feb698a0ab8574019d23cbd3060eb0513489c4 Author: Nick Mathewson Date: Wed May 9 12:18:04 2018 -0400 Comment-only fix: annotate we_are_hibernating() usage Everywhere we use we_are_hibernating(), remind the reader what it means. (Also, add

[tor-commits] [tor/master] Add functions to enable/disable periodic_event_t objects.

2018-05-10 Thread nickm
commit 80f582ae1841d262edd7f55260f350d949294c0c Author: Nick Mathewson Date: Wed May 9 12:37:47 2018 -0400 Add functions to enable/disable periodic_event_t objects. --- src/common/compat_libevent.c | 31 ++- src/common/compat_libevent.h |

[tor-commits] [tor/master] Add a new net_is_completely_disabled() function

2018-05-10 Thread nickm
commit 7595eae52ace0d2e0110e3d0471d4a5ca0c99ce9 Author: Nick Mathewson Date: Wed May 9 12:21:08 2018 -0400 Add a new net_is_completely_disabled() function --- src/or/router.c | 15 --- src/or/router.h | 1 + 2 files changed, 13 insertions(+), 3

[tor-commits] [tor/master] Add a macro to simplify control_update_global_event_mask().

2018-05-10 Thread nickm
commit 79b38081e985d65cfd08236d2eb42a87cc59a786 Author: Nick Mathewson Date: Mon May 7 16:35:52 2018 -0400 Add a macro to simplify control_update_global_event_mask(). --- src/or/control.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git

[tor-commits] [tor/master] Add we_are_fully_hibernating() to distinguish hibernation states

2018-05-10 Thread nickm
commit 50328533e3595b9cc2d3fc72f81f56572c9e732d Author: Nick Mathewson Date: Wed May 9 12:11:14 2018 -0400 Add we_are_fully_hibernating() to distinguish hibernation states We want to tell "shut down" from "shutting down". --- src/or/hibernate.c | 15

[tor-commits] [tor/master] Merge branch 'ticket26064'

2018-05-10 Thread nickm
commit beca6a585c5cd594333ae07b0ae3326188f9d67c Merge: a4a7939ae a1a7ebfb8 Author: Nick Mathewson Date: Thu May 10 09:05:15 2018 -0400 Merge branch 'ticket26064' changes/ticket26064 | 5 src/or/hibernate.c | 73

[tor-commits] [tor/master] Give responsibility for waking up from DORMANT to a mainloop event

2018-05-10 Thread nickm
commit a1a7ebfb8dbb9b104771e99571b6a60c70ee1dbe Author: Nick Mathewson Date: Wed May 9 13:41:04 2018 -0400 Give responsibility for waking up from DORMANT to a mainloop event Closes ticket 26064. --- changes/ticket26064 | 5 src/or/hibernate.c | 73

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

2018-05-10 Thread translation
commit ce6577a68fc715f1ea3af18e29a66b92ce512338 Author: Translation commit bot Date: Thu May 10 12:49:42 2018 + Update translations for support-topics_completed --- id.json | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-)

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

2018-05-10 Thread translation
commit b46102b8cd50959e5523e6223b65a6c2cbc2c2ab Author: Translation commit bot Date: Thu May 10 12:49:30 2018 + Update translations for support-tbb --- id.json | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/id.json

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

2018-05-10 Thread translation
commit ac8a0416296db456bbb7dd9e26e3fbf143e39096 Author: Translation commit bot Date: Thu May 10 12:49:38 2018 + Update translations for support-topics --- id.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/id.json b/id.json

  1   2   >