[tor-commits] [translation/tails-openpgp-applet_completed] Update translations for tails-openpgp-applet_completed

commit 786be3d500d9ce3f9bbe0a72ee64d11c18521c4e Author: Translation commit bot Date: Wed Jan 31 23:48:40 2018 + Update translations for tails-openpgp-applet_completed --- es/openpgp-applet.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/openpgp-applet.p

[tor-commits] [translation/tails-openpgp-applet] Update translations for tails-openpgp-applet

commit 4e373c1a4819e7ab22b8721ce80bd9adbd3d46c0 Author: Translation commit bot Date: Wed Jan 31 23:48:34 2018 + Update translations for tails-openpgp-applet --- es/openpgp-applet.pot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/openpgp-applet.pot b/es/op

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

commit c5ffe355662b5ad74f1b3301e30ae0475861a6e8 Author: Translation commit bot Date: Wed Jan 31 23:45:50 2018 + Update translations for liveusb-creator --- es/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po b/es/es.po index 265571439..550c4b2ca

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

commit 57a3ac4fa2fe684515cd4fc2c26fb5b9ab593550 Author: Translation commit bot Date: Wed Jan 31 23:45:56 2018 + Update translations for liveusb-creator_completed --- es/es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es/es.po b/es/es.po index 265571439..

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

commit cc206c50e1f5f3d61a8ff0ef5a09f02ff3282b17 Author: Translation commit bot Date: Wed Jan 31 22:50:21 2018 + Update translations for tails-greeter-2_completed --- es/es.po | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/es/es.po b/es/es.po index d4

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

commit 62c2266df1040b5a2f6f77229e2202bdb3572176 Author: Translation commit bot Date: Wed Jan 31 22:50:16 2018 + Update translations for tails-greeter-2 --- es/es.po | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/es/es.po b/es/es.po index d4a62f4bb..c

[tor-commits] [translation/tails-iuk_completed] Update translations for tails-iuk_completed

commit 12775ac26d302fe0e781fa37758d10cbc4222792 Author: Translation commit bot Date: Wed Jan 31 22:47:54 2018 + Update translations for tails-iuk_completed --- es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es.po b/es.po index dbd1d0a0c..b0cabd270 10064

[tor-commits] [translation/tails-iuk] Update translations for tails-iuk

commit fec26c7d901a977975ff62b78ab73b114805df87 Author: Translation commit bot Date: Wed Jan 31 22:47:48 2018 + Update translations for tails-iuk --- es.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/es.po b/es.po index dbd1d0a0c..b0cabd270 100644 --- a/es

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

commit 8d40ab78d9340160ab89be445141b5733b282c0a Author: Translation commit bot Date: Wed Jan 31 22:45:51 2018 + Update translations for liveusb-creator --- es/es.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/es.po b/es/es.po index 7a4faddc4..26557143

[tor-commits] [translation/liveusb-creator_completed] Update translations for liveusb-creator_completed

commit feda95198f70e6fcd4b3351a49bae6dde62fc453 Author: Translation commit bot Date: Wed Jan 31 22:45:59 2018 + Update translations for liveusb-creator_completed --- es/es.po | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es/es.po b/es/es.po index 7a4faddc4

[tor-commits] [tor/master] channel_tls_get_remote_addr_method now returns real_addr.

commit 33d9889a2bdd611bcc255c68c43d60b8919ab663 Author: Fernando Fernandez Mancera Date: Mon Jan 22 15:20:17 2018 +0100 channel_tls_get_remote_addr_method now returns real_addr. The accurate address of a connection is real_addr, not the addr member. channel_tls_get_remote_addr_

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

commit d1c2597096cac27eb9ee842f52384ca4cb28a195 Merge: 8b0b850ef 33d9889a2 Author: Nick Mathewson Date: Wed Jan 31 16:17:04 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' changes/bug24952| 5 + src/or/channeltls.c | 2 +- 2 files changed, 6 insertions(+), 1 d

[tor-commits] [tor/master] Change the sandbox behavior on all failed opens() to EACCES

commit 9a06282546418b2e9d21559d4853bcf124b953f4 Author: Nick Mathewson Date: Fri Jan 26 12:18:43 2018 -0500 Change the sandbox behavior on all failed opens() to EACCES Previously, most disallowed open(O_RDONLY) attempts would EACCES, but others would fail with a crash. --- cha

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

commit 8b0b850efa0f77b627f31e9907acc6d29482f362 Merge: a846fd267 9a0628254 Author: Nick Mathewson Date: Wed Jan 31 15:51:58 2018 -0500 Merge remote-tracking branch 'public/bug16106_02_nm' changes/bug16106 | 6 ++ src/common/sandbox.c | 8 ++-- 2 files changed, 8 insertions(+),

[tor-commits] [torspec/master] control: Merge prop284 into control-spec.txt

commit 6bd0a699a0856240480a4bc339722db142beec0a Author: David Goulet Date: Wed Jan 31 14:55:28 2018 -0500 control: Merge prop284 into control-spec.txt The proposal 284 is now effectively Closed. Closes #24847 Signed-off-by: David Goulet --- control-spec.txt

[tor-commits] [tor/master] Use thread-safe types to store the LOG_PROTOCOL_WARN severity

commit da778f2921d0ae49c47abb4ba4ebe5f92a999ae2 Author: Nick Mathewson Date: Wed Jan 24 12:02:44 2018 -0500 Use thread-safe types to store the LOG_PROTOCOL_WARN severity Fixes a race condition; resolves 23954. --- changes/bug23954 | 4 src/or/config.c

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

commit a846fd267edf5a457d6647b37ad7ef2ac62a1612 Merge: d44080a09 da778f292 Author: Nick Mathewson Date: Wed Jan 31 14:37:48 2018 -0500 Merge branch 'bug23954_squashed' changes/bug23954 | 4 src/or/config.c| 49 +++---

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

commit 56857291b08b65be6bc6d89e4b98e84862b559a2 Merge: 1c39d969b 31f2a8771 Author: Nick Mathewson Date: Wed Jan 31 14:33:12 2018 -0500 Merge branch 'bug25105_032' into maint-0.3.2 changes/bug25105 | 5 + src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

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

commit d44080a09da4cf05c6b2895ef7ac97c65acdd8b8 Merge: 98dd3757b 56857291b Author: Nick Mathewson Date: Wed Jan 31 14:33:27 2018 -0500 Merge branch 'maint-0.3.2' "ours" merge to avoid backport of #25105 ___ tor-commits mailing list tor-c

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

commit a877241e6c50cff72503a0179d8e4a9ed6216d57 Merge: 2485f8dea 56857291b Author: Nick Mathewson Date: Wed Jan 31 14:33:46 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug25105 | 5 + src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Fix a failing unit test.

commit 3d937043c2961923f9c28152615dc591997328f0 Author: Nick Mathewson Date: Wed Jan 31 14:06:37 2018 -0500 Fix a failing unit test. When we stopped looking at the "protocols" variable directly, we broke the hs_service/build_update_descriptors test, since it didn't actually

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

commit 56857291b08b65be6bc6d89e4b98e84862b559a2 Merge: 1c39d969b 31f2a8771 Author: Nick Mathewson Date: Wed Jan 31 14:33:12 2018 -0500 Merge branch 'bug25105_032' into maint-0.3.2 changes/bug25105 | 5 + src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.2] Look at the correct protocol for supports_v3_rendezvous_point

commit 31f2a8771cf0075f4a0ef5625d3947a683305ff9 Author: Nick Mathewson Date: Wed Jan 31 14:01:49 2018 -0500 Look at the correct protocol for supports_v3_rendezvous_point Fixes bug 25105; bugfix on 0.3.2.1-alpha. (This is a backport of bbf2d9cf6bb97c3e15ada58 for 0.3.2.) --

[tor-commits] [tor/master] Look at the correct protocol for supports_v3_rendezvous_point

commit 31f2a8771cf0075f4a0ef5625d3947a683305ff9 Author: Nick Mathewson Date: Wed Jan 31 14:01:49 2018 -0500 Look at the correct protocol for supports_v3_rendezvous_point Fixes bug 25105; bugfix on 0.3.2.1-alpha. (This is a backport of bbf2d9cf6bb97c3e15ada58 for 0.3.2.) --

[tor-commits] [tor/master] Document remaining cases for protocol support

commit 144bf015f83ba22ee2210282d574ec8572d66834 Author: Nick Mathewson Date: Wed Jan 31 13:50:04 2018 -0500 Document remaining cases for protocol support For each support flag, document which subprotocol version it requires. --- src/or/or.h | 8 +--- 1 file changed, 5 insertio

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

commit 98dd3757bfa2111707f6fe9cde7e1ece88825821 Merge: 0dc1595d0 3d937043c Author: Nick Mathewson Date: Wed Jan 31 14:32:24 2018 -0500 Merge branch 'bug25008' changes/bug25008 | 9 changes/bug25105 | 5 +++ src/or/nodelist.c | 103 +++-

[tor-commits] [tor/master] Look at the correct protocol for supports_v3_rendezvous_point

commit bbf2d9cf6bb97c3e15ada5803681f856b844c2ff Author: Nick Mathewson Date: Wed Jan 31 14:01:49 2018 -0500 Look at the correct protocol for supports_v3_rendezvous_point Fixes bug 25105; bugfix on 0.3.2.1-alpha. --- changes/bug25105 | 5 + src/or/routerparse.c | 2 +- 2 fi

[tor-commits] [tor/maint-0.3.2] Look at the correct protocol for supports_v3_rendezvous_point

commit 31f2a8771cf0075f4a0ef5625d3947a683305ff9 Author: Nick Mathewson Date: Wed Jan 31 14:01:49 2018 -0500 Look at the correct protocol for supports_v3_rendezvous_point Fixes bug 25105; bugfix on 0.3.2.1-alpha. (This is a backport of bbf2d9cf6bb97c3e15ada58 for 0.3.2.) --

[tor-commits] [tor/master] Extract code to summarize protocol versions into new function

commit 7792be2d446a35ad71d0c67fb762f868ae07b99c Author: Nick Mathewson Date: Wed Jan 24 13:38:01 2018 -0500 Extract code to summarize protocol versions into new function This will let us put this summary into routerinfo_t too. No behavior change. --- src/or/routerparse.c

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

commit 56857291b08b65be6bc6d89e4b98e84862b559a2 Merge: 1c39d969b 31f2a8771 Author: Nick Mathewson Date: Wed Jan 31 14:33:12 2018 -0500 Merge branch 'bug25105_032' into maint-0.3.2 changes/bug25105 | 5 + src/or/routerparse.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] Always look at the subprotocol versions summary flags

commit 7e504515b326fe2f302d2c1550e3a46bec29b9f6 Author: Nick Mathewson Date: Wed Jan 24 13:52:51 2018 -0500 Always look at the subprotocol versions summary flags Previously, we wouldn't do this when running with a routerinfo_t in some cases, leading to many needless calls to th

[tor-commits] [tor/master] Also cache the protover summary in the routerinfo_t, if we're using that

commit 92496a739aac44a537ee9062a4f0d71fba023156 Author: Nick Mathewson Date: Wed Jan 24 13:49:15 2018 -0500 Also cache the protover summary in the routerinfo_t, if we're using that --- src/or/or.h | 3 +++ src/or/routerparse.c | 21 - 2 files changed, 19 inser

[tor-commits] [tor/master] Extract protover summary flags into a new structure

commit d9fbd34f42274050a67f6fb6f7ad449d60af7e66 Author: Nick Mathewson Date: Wed Jan 24 13:26:50 2018 -0500 Extract protover summary flags into a new structure This will let us use them on routerinfo_t as well as on routerstatus_t, and save some time on relays. No beha

[tor-commits] [metrics-web/master] Fix path.

commit c78da5d11c7c055e6a7264190fca06a3dbb6231a Author: Karsten Loesing Date: Wed Jan 31 20:29:56 2018 +0100 Fix path. Related to renaming packages/modules in #24294. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c900

[tor-commits] [metrics-web/master] Avoid sending an error after a (partial) response.

commit b2f1b3944eb63bd7c3c383e35802a325584e84a8 Author: Karsten Loesing Date: Tue Jan 9 17:47:15 2018 +0100 Avoid sending an error after a (partial) response. Also take out some unused code. Fixes #24823. --- CHANGELOG.md | 6 +

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

commit 1c39d969b99b7825a0e2f2db67efb0c0e19d7002 Merge: df312b3cf 3a247ca92 Author: Nick Mathewson Date: Wed Jan 31 13:46:58 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2 changes/bug24975 | 6 ++ src/or/networkstatus.c | 16

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

commit 2485f8dea4182cf96696ef3e1b170337a41a5e39 Merge: c35416ab8 1c39d969b Author: Nick Mathewson Date: Wed Jan 31 13:47:01 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24975 | 6 ++ src/or/networkstatus.c | 16 2 files changed, 18 insert

[tor-commits] [tor/release-0.3.2] ns: Call notify_networkstatus_changed() after the new consensus is set globally

commit 3a247ca92a06c864a2cb634fbe2bc23cf48fb977 Author: David Goulet Date: Wed Jan 31 11:08:33 2018 -0500 ns: Call notify_networkstatus_changed() after the new consensus is set globally In 0.3.2.1-alpha, we've added this function in order to have a way to notify other subsyste

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

commit 1c39d969b99b7825a0e2f2db67efb0c0e19d7002 Merge: df312b3cf 3a247ca92 Author: Nick Mathewson Date: Wed Jan 31 13:46:58 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2 changes/bug24975 | 6 ++ src/or/networkstatus.c | 16

[tor-commits] [tor/master] ns: Call notify_networkstatus_changed() after the new consensus is set globally

commit 3a247ca92a06c864a2cb634fbe2bc23cf48fb977 Author: David Goulet Date: Wed Jan 31 11:08:33 2018 -0500 ns: Call notify_networkstatus_changed() after the new consensus is set globally In 0.3.2.1-alpha, we've added this function in order to have a way to notify other subsyste

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2

commit 1c39d969b99b7825a0e2f2db67efb0c0e19d7002 Merge: df312b3cf 3a247ca92 Author: Nick Mathewson Date: Wed Jan 31 13:46:58 2018 -0500 Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2 changes/bug24975 | 6 ++ src/or/networkstatus.c | 16

[tor-commits] [tor/maint-0.3.2] ns: Call notify_networkstatus_changed() after the new consensus is set globally

commit 3a247ca92a06c864a2cb634fbe2bc23cf48fb977 Author: David Goulet Date: Wed Jan 31 11:08:33 2018 -0500 ns: Call notify_networkstatus_changed() after the new consensus is set globally In 0.3.2.1-alpha, we've added this function in order to have a way to notify other subsyste

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

commit 0dc1595d0359dbf51ad24fe8bbadb5ab41fb9eb9 Merge: 2294e330b 1c39d969b Author: Nick Mathewson Date: Wed Jan 31 13:47:01 2018 -0500 Merge branch 'maint-0.3.2' changes/bug24975 | 6 ++ src/or/networkstatus.c | 16 2 files changed, 18 insertions(+), 4 deletion

[tor-commits] [torspec/master] clarify [will become mandatory]

commit 87d662e3a0839ba6eaee167aeda5d7cd95113f31 Author: Nick Mathewson Date: Wed Jan 31 13:45:46 2018 -0500 clarify [will become mandatory] --- dir-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index e30a2fd..0e5f048 100644 --- a

[tor-commits] [torspec/master] whitespace cleanup.

commit 0a2a40f72bcdca59a7dba44eb42cd197745a6500 Author: Nick Mathewson Date: Wed Jan 31 13:45:09 2018 -0500 whitespace cleanup. --- version-spec.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/version-spec.txt b/version-spec.txt index c97c8ce..f4db300 100644 --- a/version-spec.txt

[tor-commits] [torspec/master] version-spec: specify the different statuses that a version can have

commit ec009108ec08216a111761a7277516a7b26e2252 Author: Nick Mathewson Date: Fri Jan 26 12:54:42 2018 -0500 version-spec: specify the different statuses that a version can have --- version-spec.txt | 26 ++ 1 file changed, 26 insertions(+) diff --git a/version-spec

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

commit 2294e330bde259f6b575f301258783ce2947bdc0 Merge: 1e81aaa62 df312b3cf Author: Nick Mathewson Date: Wed Jan 31 12:51:45 2018 -0500 Merge branch 'maint-0.3.2' changes/bug24976 | 5 + src/or/hs_cache.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

[tor-commits] [tor/master] hs-v3: Remove a BUG() when storing a descriptor in the client cache

commit df312b3cf637d2c5487adc60ed541823bef56f06 Author: David Goulet Date: Wed Jan 31 10:58:11 2018 -0500 hs-v3: Remove a BUG() when storing a descriptor in the client cache It is possible in normal circumstances that a client fetches a descriptor that has a lower revision cou

[tor-commits] [tor/maint-0.3.2] hs-v3: Remove a BUG() when storing a descriptor in the client cache

commit df312b3cf637d2c5487adc60ed541823bef56f06 Author: David Goulet Date: Wed Jan 31 10:58:11 2018 -0500 hs-v3: Remove a BUG() when storing a descriptor in the client cache It is possible in normal circumstances that a client fetches a descriptor that has a lower revision cou

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

commit c35416ab8fbb360fded3db875eb252ba1a9b3273 Merge: 8dc3b5ff3 df312b3cf Author: Nick Mathewson Date: Wed Jan 31 12:51:45 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24976 | 5 + src/or/hs_cache.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) _

[tor-commits] [tor/release-0.3.2] hs-v3: Remove a BUG() when storing a descriptor in the client cache

commit df312b3cf637d2c5487adc60ed541823bef56f06 Author: David Goulet Date: Wed Jan 31 10:58:11 2018 -0500 hs-v3: Remove a BUG() when storing a descriptor in the client cache It is possible in normal circumstances that a client fetches a descriptor that has a lower revision cou

[tor-commits] [translation/tails-misc_completed] Update translations for tails-misc_completed

commit 96c9d4f969c42a1a52b0102be8cb8a0896e920bc Author: Translation commit bot Date: Wed Jan 31 15:47:11 2018 + Update translations for tails-misc_completed --- nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl.po b/nl.po index b3fa06439..c8401ce61 100644 ---

[tor-commits] [translation/tails-misc] Update translations for tails-misc

commit 775a3a939c2671515f76739fa199b63aca3a9dd6 Author: Translation commit bot Date: Wed Jan 31 15:47:06 2018 + Update translations for tails-misc --- nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nl.po b/nl.po index b3fa06439..c8401ce61 100644 --- a/nl.po +

[tor-commits] [collector/master] Add webstats module with sync and local import functionality.

commit 97e577ae73ec631ac5d7448cb9f525594baa0c8a Author: iwakeh Date: Mon Oct 9 12:23:53 2017 + Add webstats module with sync and local import functionality. Implements task-22428. --- CHANGELOG.md | 6 +- build.xml

[tor-commits] [tor/release-0.3.2] But in most Earth cultures, there are 60s in a minute.

commit 5fc0437e748932291627ebd7fd949b987023362e Author: Nick Mathewson Date: Wed Jan 31 10:06:43 2018 -0500 But in most Earth cultures, there are 60s in a minute. --- src/or/consdiffmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/consdiffmgr.c b/src/or/cons

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

commit 8dc3b5ff3aa3e78d2834c4ffdaf711d4849e24c3 Merge: da2daa8e5 9bfb6fe39 Author: Nick Mathewson Date: Wed Jan 31 10:06:49 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/consdiffmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/release-0.3.1] But in most Earth cultures, there are 60s in a minute.

commit 5fc0437e748932291627ebd7fd949b987023362e Author: Nick Mathewson Date: Wed Jan 31 10:06:43 2018 -0500 But in most Earth cultures, there are 60s in a minute. --- src/or/consdiffmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/consdiffmgr.c b/src/or/cons

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

commit 9bfb6fe3958240172f1133e918d1fc6bd5732532 Merge: cb90defba 5fc0437e7 Author: Nick Mathewson Date: Wed Jan 31 10:06:49 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 src/or/consdiffmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

commit 6d0309e48b9b67cb1f0c0b3130bebfed489a44ba Merge: d83d1c7a8 5fc0437e7 Author: Nick Mathewson Date: Wed Jan 31 10:06:49 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 src/or/consdiffmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[tor-commits] [tor/master] But in most Earth cultures, there are 60s in a minute.

commit 5fc0437e748932291627ebd7fd949b987023362e Author: Nick Mathewson Date: Wed Jan 31 10:06:43 2018 -0500 But in most Earth cultures, there are 60s in a minute. --- src/or/consdiffmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/consdiffmgr.c b/src/or/cons

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

commit 1e81aaa62f8c7c4ac7dfd3c8b4182cc2d5368ab5 Merge: 8b162443b 9bfb6fe39 Author: Nick Mathewson Date: Wed Jan 31 10:06:49 2018 -0500 Merge branch 'maint-0.3.2' src/or/consdiffmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___ tor

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

commit 9bfb6fe3958240172f1133e918d1fc6bd5732532 Merge: cb90defba 5fc0437e7 Author: Nick Mathewson Date: Wed Jan 31 10:06:49 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 src/or/consdiffmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ___

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

commit 9bfb6fe3958240172f1133e918d1fc6bd5732532 Merge: cb90defba 5fc0437e7 Author: Nick Mathewson Date: Wed Jan 31 10:06:49 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 src/or/consdiffmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) __

[tor-commits] [tor/maint-0.3.1] But in most Earth cultures, there are 60s in a minute.

commit 5fc0437e748932291627ebd7fd949b987023362e Author: Nick Mathewson Date: Wed Jan 31 10:06:43 2018 -0500 But in most Earth cultures, there are 60s in a minute. --- src/or/consdiffmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/consdiffmgr.c b/src/or/cons

[tor-commits] [tor/maint-0.3.2] But in most Earth cultures, there are 60s in a minute.

commit 5fc0437e748932291627ebd7fd949b987023362e Author: Nick Mathewson Date: Wed Jan 31 10:06:43 2018 -0500 But in most Earth cultures, there are 60s in a minute. --- src/or/consdiffmgr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/consdiffmgr.c b/src/or/cons

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

commit da2daa8e5e6149b81a3c859db3be6409956c8857 Merge: 3d7f134be cb90defba Author: Nick Mathewson Date: Wed Jan 31 10:01:13 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/consdiffmgr.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) __

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

commit d83d1c7a890eea5dca8c9db9c8b9b75ad2fa8f1a Merge: 76b73013e 86e6cb640 Author: Nick Mathewson Date: Wed Jan 31 10:01:13 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 src/or/consdiffmgr.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) __

[tor-commits] [tor/release-0.3.2] add a rate-limit.

commit 86e6cb640942de251e601b43a8afad45c4761268 Author: Nick Mathewson Date: Wed Jan 31 10:01:10 2018 -0500 add a rate-limit. --- src/or/consdiffmgr.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index e2bb31e52..18aa

[tor-commits] [tor/release-0.3.1] add a rate-limit.

commit 86e6cb640942de251e601b43a8afad45c4761268 Author: Nick Mathewson Date: Wed Jan 31 10:01:10 2018 -0500 add a rate-limit. --- src/or/consdiffmgr.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index e2bb31e52..18aa

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

commit 8b162443b91b12e876d94282f1d5d6e0d519cb95 Merge: 69e242f84 cb90defba Author: Nick Mathewson Date: Wed Jan 31 10:01:13 2018 -0500 Merge branch 'maint-0.3.2' src/or/consdiffmgr.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) _

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

commit cb90defba6f16ac96578a6b88c2c3d384a7748ee Merge: e81896add 86e6cb640 Author: Nick Mathewson Date: Wed Jan 31 10:01:13 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 src/or/consdiffmgr.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) _

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

commit cb90defba6f16ac96578a6b88c2c3d384a7748ee Merge: e81896add 86e6cb640 Author: Nick Mathewson Date: Wed Jan 31 10:01:13 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 src/or/consdiffmgr.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) _

[tor-commits] [tor/master] add a rate-limit.

commit 86e6cb640942de251e601b43a8afad45c4761268 Author: Nick Mathewson Date: Wed Jan 31 10:01:10 2018 -0500 add a rate-limit. --- src/or/consdiffmgr.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index e2bb31e52..18aa

[tor-commits] [tor/maint-0.3.2] add a rate-limit.

commit 86e6cb640942de251e601b43a8afad45c4761268 Author: Nick Mathewson Date: Wed Jan 31 10:01:10 2018 -0500 add a rate-limit. --- src/or/consdiffmgr.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index e2bb31e52..18aa

[tor-commits] [tor/maint-0.3.1] add a rate-limit.

commit 86e6cb640942de251e601b43a8afad45c4761268 Author: Nick Mathewson Date: Wed Jan 31 10:01:10 2018 -0500 add a rate-limit. --- src/or/consdiffmgr.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index e2bb31e52..18aa

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

commit cb90defba6f16ac96578a6b88c2c3d384a7748ee Merge: e81896add 86e6cb640 Author: Nick Mathewson Date: Wed Jan 31 10:01:13 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 src/or/consdiffmgr.c | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)

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

commit e81896adda197b705958bcbe2b9d2c5db839b8a5 Merge: ee5c624be 9c2bc441f Author: Nick Mathewson Date: Wed Jan 31 09:50:24 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24859 | 4 src/or/consdiffmgr.c | 5 - 2 files changed, 8 insertions(+), 1 deletion(-)

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

commit 3d7f134bea38b94a2454dcabe0ce6d32dbbd3059 Merge: 6b629d309 e81896add Author: Nick Mathewson Date: Wed Jan 31 09:50:24 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24859 | 4 src/or/consdiffmgr.c | 5 - 2 files changed, 8 insertions(+), 1 deletion(

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

commit 76b73013e29661a55cbee098c5326b57d3ec6069 Merge: 0e0baad5e 9c2bc441f Author: Nick Mathewson Date: Wed Jan 31 09:50:24 2018 -0500 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug24859 | 4 src/or/consdiffmgr.c | 5 - 2 files changed, 8 insertions(+), 1 deletion(

[tor-commits] [tor/maint-0.3.2] If out-of-disk when saving a consensus cache entry, don't BUG.

commit 9c2bc441f8acf6fb47c7cc1f09c04974ee35d694 Author: Nick Mathewson Date: Fri Jan 26 13:14:14 2018 -0500 If out-of-disk when saving a consensus cache entry, don't BUG. Just warn instead. Fixes bug 24859. --- changes/bug24859 | 4 src/or/consdiffmgr.c | 5 -

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

commit e81896adda197b705958bcbe2b9d2c5db839b8a5 Merge: ee5c624be 9c2bc441f Author: Nick Mathewson Date: Wed Jan 31 09:50:24 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24859 | 4 src/or/consdiffmgr.c | 5 - 2 files changed, 8 insertions(+), 1 deletion(-)

[tor-commits] [tor/maint-0.3.1] If out-of-disk when saving a consensus cache entry, don't BUG.

commit 9c2bc441f8acf6fb47c7cc1f09c04974ee35d694 Author: Nick Mathewson Date: Fri Jan 26 13:14:14 2018 -0500 If out-of-disk when saving a consensus cache entry, don't BUG. Just warn instead. Fixes bug 24859. --- changes/bug24859 | 4 src/or/consdiffmgr.c | 5 -

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

commit 69e242f845fa53ee0930127dc9dccae8ca5c70e8 Merge: 914ec372a e81896add Author: Nick Mathewson Date: Wed Jan 31 09:50:24 2018 -0500 Merge branch 'maint-0.3.2' changes/bug24859 | 4 src/or/consdiffmgr.c | 5 - 2 files changed, 8 insertions(+), 1 deletion(-) ___

[tor-commits] [tor/release-0.3.2] If out-of-disk when saving a consensus cache entry, don't BUG.

commit 9c2bc441f8acf6fb47c7cc1f09c04974ee35d694 Author: Nick Mathewson Date: Fri Jan 26 13:14:14 2018 -0500 If out-of-disk when saving a consensus cache entry, don't BUG. Just warn instead. Fixes bug 24859. --- changes/bug24859 | 4 src/or/consdiffmgr.c | 5 -

[tor-commits] [tor/release-0.3.1] If out-of-disk when saving a consensus cache entry, don't BUG.

commit 9c2bc441f8acf6fb47c7cc1f09c04974ee35d694 Author: Nick Mathewson Date: Fri Jan 26 13:14:14 2018 -0500 If out-of-disk when saving a consensus cache entry, don't BUG. Just warn instead. Fixes bug 24859. --- changes/bug24859 | 4 src/or/consdiffmgr.c | 5 -

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

commit e81896adda197b705958bcbe2b9d2c5db839b8a5 Merge: ee5c624be 9c2bc441f Author: Nick Mathewson Date: Wed Jan 31 09:50:24 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24859 | 4 src/or/consdiffmgr.c | 5 - 2 files changed, 8 insertions(+), 1 deletion(-)

[tor-commits] [tor/master] If out-of-disk when saving a consensus cache entry, don't BUG.

commit 9c2bc441f8acf6fb47c7cc1f09c04974ee35d694 Author: Nick Mathewson Date: Fri Jan 26 13:14:14 2018 -0500 If out-of-disk when saving a consensus cache entry, don't BUG. Just warn instead. Fixes bug 24859. --- changes/bug24859 | 4 src/or/consdiffmgr.c | 5 -

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

commit 914ec372a9352308c3990afb5304f7e8d39b1020 Merge: 80c8689be 0755bcc36 Author: Nick Mathewson Date: Wed Jan 31 09:47:36 2018 -0500 Merge branch 'bug24927' changes/bug24927| 4 src/or/circuituse.c | 7 --- 2 files changed, 8 insertions(+), 3 deletions(-) _

[tor-commits] [tor/master] Remove a needless (always-true) check.

commit 0755bcc36ac81e4a7d569b67f5e5a2267ed47620 Author: Nick Mathewson Date: Fri Jan 26 13:35:00 2018 -0500 Remove a needless (always-true) check. Also add an assertion and rename a variable. Closes ticekt 24927. --- changes/bug24927| 4 src/or/circuituse.c | 7 +

[tor-commits] [tor/master] Improve log when unable to add sigs to pending consensus

commit 75d4bd34976536643b634f860b3d2c0e06d875ee Author: Nick Mathewson Date: Fri Jan 26 14:19:59 2018 -0500 Improve log when unable to add sigs to pending consensus Closes ticket 24849. --- changes/ticket24849 | 3 +++ src/or/dirvote.c| 8 +++- 2 files changed, 10 insertio

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

commit 80c8689be1d0b6d926752059b51966d398f7c184 Merge: 94878cf1e 75d4bd349 Author: Nick Mathewson Date: Wed Jan 31 09:38:24 2018 -0500 Merge remote-tracking branch 'public/ticket24849_032' changes/ticket24849 | 3 +++ src/or/dirvote.c| 8 +++- 2 files changed, 10 insertions(+), 1

[tor-commits] [tor/master] test: Add unit tests for overflows and underflows in cc_stats_refill_bucket

commit 1f4a73133cf864774c017e2c50b347727519c18f Author: teor Date: Wed Jan 31 11:22:20 2018 +1100 test: Add unit tests for overflows and underflows in cc_stats_refill_bucket Closes #25094. Signed-off-by: David Goulet --- src/test/test_dos.c | 146

[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket24902_029_05'

commit 94878cf1eaa59f4aae6bc88c93d55c4ecba1e0d9 Merge: c0447033f 1f4a73133 Author: Nick Mathewson Date: Wed Jan 31 09:35:07 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' src/or/dos.c| 82 - src/or/dos.h| 2 +- src/test/

[tor-commits] [tor/master] dos: Make sure cc_stats_refill_bucket can't overflow while calculating

commit a09d5f5735abe2e1d16cf0ee9389ae096d5e7ef1 Author: teor Date: Wed Jan 31 11:13:17 2018 +1100 dos: Make sure cc_stats_refill_bucket can't overflow while calculating Debug log the elapsed time in cc_stats_refill_bucket Part of #25094. Signed-off-by: David Goule

[tor-commits] [tor/master] test: Remove a redundant round from test_dos_bucket_refill

commit b45ae1b00237f0209c4ccce777de59581fda5e39 Author: teor Date: Wed Jan 31 11:11:08 2018 +1100 test: Remove a redundant round from test_dos_bucket_refill This round is left over from the tenths of a second code. Part of #25094. --- src/test/test_dos.c | 2 +- 1 file ch

[tor-commits] [tor/master] When a tor_cert_T check fails, log the reason why.

commit ee5c624bebbc8e823ed49fe563fd56294fb226d4 Author: Nick Mathewson Date: Fri Jan 26 13:55:25 2018 -0500 When a tor_cert_T check fails, log the reason why. Diagnostic attempt for 24972. --- changes/bug24972 | 4 src/or/hs_client.c | 6 -- src/or/hs_descript

[tor-commits] [tor/maint-0.3.2] When a tor_cert_T check fails, log the reason why.

commit ee5c624bebbc8e823ed49fe563fd56294fb226d4 Author: Nick Mathewson Date: Fri Jan 26 13:55:25 2018 -0500 When a tor_cert_T check fails, log the reason why. Diagnostic attempt for 24972. --- changes/bug24972 | 4 src/or/hs_client.c | 6 -- src/or/hs_descript

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

commit 6b629d30953b02857131f0f41fcb13964c0b33b3 Merge: 677bebda7 ee5c624be Author: Nick Mathewson Date: Wed Jan 31 09:19:55 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24972 | 4 src/or/hs_client.c | 6 -- src/or/hs_descriptor.c | 9 ++---

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

commit c0447033f5e1032be379b9b78d9085f71fd51bd6 Merge: d2ae1bfcb ee5c624be Author: Nick Mathewson Date: Wed Jan 31 09:19:55 2018 -0500 Merge branch 'maint-0.3.2' changes/bug24972 | 4 src/or/hs_client.c | 6 -- src/or/hs_descriptor.c | 9 ++--- src/or/routerkeys.

[tor-commits] [tor/release-0.3.2] When a tor_cert_T check fails, log the reason why.

commit ee5c624bebbc8e823ed49fe563fd56294fb226d4 Author: Nick Mathewson Date: Fri Jan 26 13:55:25 2018 -0500 When a tor_cert_T check fails, log the reason why. Diagnostic attempt for 24972. --- changes/bug24972 | 4 src/or/hs_client.c | 6 -- src/or/hs_descript

  1   2   >