[tor-commits] [metrics-lib/master] Add log line interfaces and access methods.

2018-02-16 Thread karsten
commit 59689a9fa4c162378f347902eb68e4c21ccf0043 Author: iwakeh Date: Tue Feb 6 14:59:05 2018 + Add log line interfaces and access methods. For both the general LogDescriptor and extension WebServerAccessLog. Include some new tests. ---

[tor-commits] [metrics-web/master] Include Relay Search assets in generated WAR (See: #25258)

2018-02-16 Thread karsten
commit f5a27ce3ae8fdbcbeebd978f1b7d1f55358327e2 Author: Iain R. Learmonth Date: Thu Feb 15 12:59:53 2018 + Include Relay Search assets in generated WAR (See: #25258) --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml

[tor-commits] [metrics-web/master] Update Relay Search link on the Services page.

2018-02-16 Thread karsten
commit 78769f653bde8eb7aa5a372465c2d407dd17396f Author: Karsten Loesing Date: Fri Feb 16 09:36:15 2018 +0100 Update Relay Search link on the Services page. --- src/main/resources/web/jsps/services.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[tor-commits] [metrics-web/master] Adds RelaySearchServlet and accompanying JSP (Fixes: #25258)

2018-02-16 Thread karsten
commit 9b42e1712595546144fe56e3e0afdc58388e492c Author: Iain R. Learmonth Date: Thu Feb 15 13:00:57 2018 + Adds RelaySearchServlet and accompanying JSP (Fixes: #25258) --- .../torproject/metrics/web/RelaySearchServlet.java | 33

[tor-commits] [metrics-web/master] Include Relay Search as a submodule (See: #25258)

2018-02-16 Thread karsten
commit eacf2fca3400fa7a01585b4657cdfa86a273d61c Author: Iain R. Learmonth Date: Thu Feb 15 12:59:09 2018 + Include Relay Search as a submodule (See: #25258) --- .gitmodules | 3 +++ src/main/resources/web/rs | 1 + 2 files changed, 4 insertions(+) diff

[tor-commits] [metrics-web/master] Allows additional stylesheets to be specified

2018-02-16 Thread karsten
commit 2cb348ec7bc2e014eba28c55bdd01a6772aa1fd7 Author: Iain R. Learmonth Date: Wed Feb 14 17:15:16 2018 + Allows additional stylesheets to be specified This change allows for servlets or JSPs to specify additional stylesheets to be included in the section

[tor-commits] [metrics-web/master] Adds a servlet mapping for RelaySearchServlet (See: #25258)

2018-02-16 Thread karsten
commit e1035d8af074797c37bc5acc276a59a1c795ee8d Author: Iain R. Learmonth Date: Thu Feb 15 13:01:32 2018 + Adds a servlet mapping for RelaySearchServlet (See: #25258) --- src/main/resources/web.xml | 11 +++ 1 file changed, 11 insertions(+) diff --git

[tor-commits] [stem/master] Add couple new consensus parameters

2018-02-16 Thread atagar
commit 4a8cbbccd6703725eaeb02f9e0138abbd09848bb Author: Damian Johnson Date: Fri Feb 16 17:39:36 2018 -0800 Add couple new consensus parameters Couple new parameters in the spec. The default of one was changed in a followup commit...

[tor-commits] [stem/master] Allow 'proto' lines to have blank values

2018-02-16 Thread atagar
commit 48d9b843481973e8d5f193defdf6869c5f69a9cc Author: Damian Johnson Date: Fri Feb 16 17:28:20 2018 -0800 Allow 'proto' lines to have blank values Taking into account a small spec change...

[tor-commits] [doctor/master] Fix gentoo suppression check

2018-02-16 Thread atagar
commit 0e3d1c1b09711f7d4db0481fbd2cfbae3cf562d9 Author: Damian Johnson Date: Fri Feb 16 16:48:20 2018 -0800 Fix gentoo suppression check Oops, inverted this. :P --- package_versions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[tor-commits] [doctor/master] Don't notify when HSDir flag counts are odd

2018-02-16 Thread atagar
commit db1285615a3df6564a7182c84d7edfc684991163 Author: Damian Johnson Date: Fri Feb 16 16:52:23 2018 -0800 Don't notify when HSDir flag counts are odd Suppression requested by Roger...

[tor-commits] [doctor/master] Properly time suppress new flag count notices

2018-02-16 Thread atagar
commit 6b6d16c5afd8e9f8e31b0cd3a856a218bc244b91 Author: Damian Johnson Date: Fri Feb 16 16:56:08 2018 -0800 Properly time suppress new flag count notices The counts vary every hour so time based suppressions didn't work. --- consensus_health_checker.py | 5

[tor-commits] [tor/master] tor_zstd_format_version shouldn't be built when !HAVE_ZSTD

2018-02-16 Thread nickm
commit 5a9ada342fb17a7c3ba69efbdd548ec278b0e070 Author: Nick Mathewson Date: Fri Feb 16 08:06:01 2018 -0500 tor_zstd_format_version shouldn't be built when !HAVE_ZSTD Fixes bug 25276; bugfix not in any released Tor. --- src/common/compress_zstd.c | 2 ++ 1

[tor-commits] [tor/master] Compilation workaround for windows, which lacks O_SYNC

2018-02-16 Thread nickm
commit 200fc8c640341dde657bd5162b9468cbd07d2938 Author: Nick Mathewson Date: Fri Feb 16 08:16:12 2018 -0500 Compilation workaround for windows, which lacks O_SYNC Bug not in any released Tor. --- src/or/keypin.c | 3 +++ 1 file changed, 3 insertions(+) diff

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

2018-02-16 Thread nickm
commit 3930ffdf63425c344e14c45cff6780108cfa038b Merge: d21e5cfc2 2b99350ca Author: Nick Mathewson Date: Fri Feb 16 08:47:12 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid conflicts with the cherry-picked fix for 24898.

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

2018-02-16 Thread nickm
commit c8b087d90109d740e57d0347cb3df8d1be336337 Merge: cb9a322b6 3930ffdf6 Author: Nick Mathewson Date: Fri Feb 16 08:47:41 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24898-029 | 6 ++ 1 file changed, 6 insertions(+)

[tor-commits] [tor/maint-0.2.9] backport to make channel_is_client() accurate

2018-02-16 Thread nickm
commit 8d5dcdbda2160b6375cb479827d8cc2f16e06777 Author: Roger Dingledine Date: Tue Jan 30 18:05:39 2018 -0500 backport to make channel_is_client() accurate This commit takes a piece of commit af8cadf3a9 and a piece of commit 46fe353f25, with the goal of

[tor-commits] [tor/maint-0.3.1] stop calling channel_mark_client in response to a create_fast

2018-02-16 Thread nickm
commit d21e5cfc241204ccc6b8b0a484573edaea086772 Author: Roger Dingledine Date: Wed Jan 31 03:21:27 2018 -0500 stop calling channel_mark_client in response to a create_fast since all it does is produce false positives this commit should get merged into

[tor-commits] [tor/maint-0.3.3] stop calling channel_mark_client in response to a create_fast

2018-02-16 Thread nickm
commit 2b99350ca4c905db1bd4f1aecc630b4f55933e96 Author: Roger Dingledine Date: Wed Jan 31 03:21:27 2018 -0500 stop calling channel_mark_client in response to a create_fast since all it does is produce false positives this commit should get merged into

[tor-commits] [tor/maint-0.3.3] backport to make channel_is_client() accurate

2018-02-16 Thread nickm
commit 8d5dcdbda2160b6375cb479827d8cc2f16e06777 Author: Roger Dingledine Date: Tue Jan 30 18:05:39 2018 -0500 backport to make channel_is_client() accurate This commit takes a piece of commit af8cadf3a9 and a piece of commit 46fe353f25, with the goal of

[tor-commits] [tor/maint-0.3.2] stop calling channel_mark_client in response to a create_fast

2018-02-16 Thread nickm
commit 2b99350ca4c905db1bd4f1aecc630b4f55933e96 Author: Roger Dingledine Date: Wed Jan 31 03:21:27 2018 -0500 stop calling channel_mark_client in response to a create_fast since all it does is produce false positives this commit should get merged into

[tor-commits] [tor/maint-0.3.1] backport to make channel_is_client() accurate

2018-02-16 Thread nickm
commit 8d5dcdbda2160b6375cb479827d8cc2f16e06777 Author: Roger Dingledine Date: Tue Jan 30 18:05:39 2018 -0500 backport to make channel_is_client() accurate This commit takes a piece of commit af8cadf3a9 and a piece of commit 46fe353f25, with the goal of

[tor-commits] [tor/maint-0.3.1] stop calling channel_mark_client in response to a create_fast

2018-02-16 Thread nickm
commit 2b99350ca4c905db1bd4f1aecc630b4f55933e96 Author: Roger Dingledine Date: Wed Jan 31 03:21:27 2018 -0500 stop calling channel_mark_client in response to a create_fast since all it does is produce false positives this commit should get merged into

[tor-commits] [tor/maint-0.3.2] backport to make channel_is_client() accurate

2018-02-16 Thread nickm
commit 8d5dcdbda2160b6375cb479827d8cc2f16e06777 Author: Roger Dingledine Date: Tue Jan 30 18:05:39 2018 -0500 backport to make channel_is_client() accurate This commit takes a piece of commit af8cadf3a9 and a piece of commit 46fe353f25, with the goal of

[tor-commits] [tor/maint-0.2.9] stop calling channel_mark_client in response to a create_fast

2018-02-16 Thread nickm
commit 2b99350ca4c905db1bd4f1aecc630b4f55933e96 Author: Roger Dingledine Date: Wed Jan 31 03:21:27 2018 -0500 stop calling channel_mark_client in response to a create_fast since all it does is produce false positives this commit should get merged into

[tor-commits] [tor/maint-0.3.3] stop calling channel_mark_client in response to a create_fast

2018-02-16 Thread nickm
commit d21e5cfc241204ccc6b8b0a484573edaea086772 Author: Roger Dingledine Date: Wed Jan 31 03:21:27 2018 -0500 stop calling channel_mark_client in response to a create_fast since all it does is produce false positives this commit should get merged into

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

2018-02-16 Thread nickm
commit 9f1899fdfd611861bd1a254a6ba6df4ddf05f5da Merge: 8970058af c67adddac Author: Nick Mathewson Date: Fri Feb 16 08:49:08 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug24898-029 | 6 -- 1 file changed, 6 deletions(-)

[tor-commits] [tor/master] stop calling channel_mark_client in response to a create_fast

2018-02-16 Thread nickm
commit d21e5cfc241204ccc6b8b0a484573edaea086772 Author: Roger Dingledine Date: Wed Jan 31 03:21:27 2018 -0500 stop calling channel_mark_client in response to a create_fast since all it does is produce false positives this commit should get merged into

[tor-commits] [tor/master] backport to make channel_is_client() accurate

2018-02-16 Thread nickm
commit 8d5dcdbda2160b6375cb479827d8cc2f16e06777 Author: Roger Dingledine Date: Tue Jan 30 18:05:39 2018 -0500 backport to make channel_is_client() accurate This commit takes a piece of commit af8cadf3a9 and a piece of commit 46fe353f25, with the goal of

[tor-commits] [tor/master] stop calling channel_mark_client in response to a create_fast

2018-02-16 Thread nickm
commit 2b99350ca4c905db1bd4f1aecc630b4f55933e96 Author: Roger Dingledine Date: Wed Jan 31 03:21:27 2018 -0500 stop calling channel_mark_client in response to a create_fast since all it does is produce false positives this commit should get merged into

[tor-commits] [tor/release-0.2.9] stop calling channel_mark_client in response to a create_fast

2018-02-16 Thread nickm
commit 2b99350ca4c905db1bd4f1aecc630b4f55933e96 Author: Roger Dingledine Date: Wed Jan 31 03:21:27 2018 -0500 stop calling channel_mark_client in response to a create_fast since all it does is produce false positives this commit should get merged into

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

2018-02-16 Thread nickm
commit 5c48f62e67faf9d7ba825bba7ddec446aa8d8aed Merge: 152703238 9f1899fdf Author: Nick Mathewson Date: Fri Feb 16 08:49:08 2018 -0500 Merge branch 'maint-0.3.3' changes/bug24898-029 | 6 -- 1 file changed, 6 deletions(-)

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

2018-02-16 Thread nickm
commit 8970058af6822b14bc06e7a98230b8b13c0084a9 Merge: d662d4470 c8b087d90 Author: Nick Mathewson Date: Fri Feb 16 08:47:41 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug24898-029 | 6 ++ 1 file changed, 6 insertions(+)

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

2018-02-16 Thread nickm
commit 152703238455d97fa56b7db8bf705d1c71cbca05 Merge: c2fa74380 8970058af Author: Nick Mathewson Date: Fri Feb 16 08:47:41 2018 -0500 Merge branch 'maint-0.3.3' changes/bug24898-029 | 6 ++ 1 file changed, 6 insertions(+)

[tor-commits] [tor/master] Remove changes file for 24898-029 backports in maint-0.3.2

2018-02-16 Thread nickm
commit c67adddacb56f90d77786820f29ca2b4b9f91cae Author: Nick Mathewson Date: Fri Feb 16 08:48:46 2018 -0500 Remove changes file for 24898-029 backports in maint-0.3.2 These patches were already merged, and so don't need a changes file in these branches.

[tor-commits] [tor/maint-0.3.2] stop calling channel_mark_client in response to a create_fast

2018-02-16 Thread nickm
commit d21e5cfc241204ccc6b8b0a484573edaea086772 Author: Roger Dingledine Date: Wed Jan 31 03:21:27 2018 -0500 stop calling channel_mark_client in response to a create_fast since all it does is produce false positives this commit should get merged into

[tor-commits] [tor/maint-0.3.2] Remove changes file for 24898-029 backports in maint-0.3.2

2018-02-16 Thread nickm
commit c67adddacb56f90d77786820f29ca2b4b9f91cae Author: Nick Mathewson Date: Fri Feb 16 08:48:46 2018 -0500 Remove changes file for 24898-029 backports in maint-0.3.2 These patches were already merged, and so don't need a changes file in these branches.

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

2018-02-16 Thread nickm
commit 9f1899fdfd611861bd1a254a6ba6df4ddf05f5da Merge: 8970058af c67adddac Author: Nick Mathewson Date: Fri Feb 16 08:49:08 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug24898-029 | 6 -- 1 file changed, 6 deletions(-)

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

2018-02-16 Thread nickm
commit 7e664bf74ff4c2374d59d4a663799454bb86d10a Merge: 4bfbce9de c8b087d90 Author: Nick Mathewson Date: Fri Feb 16 08:47:41 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24898-029 | 6 ++ 1 file changed, 6 insertions(+)

[tor-commits] [tor/release-0.3.3] stop calling channel_mark_client in response to a create_fast

2018-02-16 Thread nickm
commit d21e5cfc241204ccc6b8b0a484573edaea086772 Author: Roger Dingledine Date: Wed Jan 31 03:21:27 2018 -0500 stop calling channel_mark_client in response to a create_fast since all it does is produce false positives this commit should get merged into

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

2018-02-16 Thread nickm
commit c8b087d90109d740e57d0347cb3df8d1be336337 Merge: cb9a322b6 3930ffdf6 Author: Nick Mathewson Date: Fri Feb 16 08:47:41 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24898-029 | 6 ++ 1 file changed, 6 insertions(+)

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

2018-02-16 Thread nickm
commit 3930ffdf63425c344e14c45cff6780108cfa038b Merge: d21e5cfc2 2b99350ca Author: Nick Mathewson Date: Fri Feb 16 08:47:12 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid conflicts with the cherry-picked fix for 24898.

[tor-commits] [tor/release-0.3.3] backport to make channel_is_client() accurate

2018-02-16 Thread nickm
commit 8d5dcdbda2160b6375cb479827d8cc2f16e06777 Author: Roger Dingledine Date: Tue Jan 30 18:05:39 2018 -0500 backport to make channel_is_client() accurate This commit takes a piece of commit af8cadf3a9 and a piece of commit 46fe353f25, with the goal of

[tor-commits] [tor/release-0.3.2] Remove changes file for 24898-029 backports in maint-0.3.2

2018-02-16 Thread nickm
commit c67adddacb56f90d77786820f29ca2b4b9f91cae Author: Nick Mathewson Date: Fri Feb 16 08:48:46 2018 -0500 Remove changes file for 24898-029 backports in maint-0.3.2 These patches were already merged, and so don't need a changes file in these branches.

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

2018-02-16 Thread nickm
commit cc17922645ff9224d70ab8c6e5f53bc705119267 Merge: 7e664bf74 c67adddac Author: Nick Mathewson Date: Fri Feb 16 08:49:08 2018 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 changes/bug24898-029 | 6 -- 1 file changed, 6 deletions(-)

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

2018-02-16 Thread nickm
commit 3930ffdf63425c344e14c45cff6780108cfa038b Merge: d21e5cfc2 2b99350ca Author: Nick Mathewson Date: Fri Feb 16 08:47:12 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 "ours" merge to avoid conflicts with the cherry-picked fix for 24898.

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

2018-02-16 Thread nickm
commit 8970058af6822b14bc06e7a98230b8b13c0084a9 Merge: d662d4470 c8b087d90 Author: Nick Mathewson Date: Fri Feb 16 08:47:41 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug24898-029 | 6 ++ 1 file changed, 6 insertions(+)

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

2018-02-16 Thread nickm
commit 9f1899fdfd611861bd1a254a6ba6df4ddf05f5da Merge: 8970058af c67adddac Author: Nick Mathewson Date: Fri Feb 16 08:49:08 2018 -0500 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug24898-029 | 6 -- 1 file changed, 6 deletions(-)

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

2018-02-16 Thread nickm
commit 2bcd264a28e2d6bec1e806e779bf82435c9c7505 Merge: 3930ffdf6 cb92d47de Author: Nick Mathewson Date: Fri Feb 16 09:48:11 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24952| 5 + changes/bug25223| 4 +

[tor-commits] [tor/maint-0.3.2] remove a redundant semicolon

2018-02-16 Thread nickm
commit 22a5d3dd2ab793336e911d3aceb8cacd278e0f48 Author: Nick Mathewson Date: Tue Jan 30 18:11:16 2018 -0500 remove a redundant semicolon --- src/test/test_dos.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_dos.c

[tor-commits] [tor/maint-0.3.2] man: Document default values if not in the consensus for DoS mitigation

2018-02-16 Thread nickm
commit 9cf8d669fa416c151f60cb79b6ef2ab53ecf Author: David Goulet Date: Tue Feb 13 10:53:47 2018 -0500 man: Document default values if not in the consensus for DoS mitigation Fixes #25236 Signed-off-by: David Goulet ---

[tor-commits] [tor/maint-0.3.2] geoip: Make geoip_client_cache_total_allocation() return the counter

2018-02-16 Thread nickm
commit f08fa974600625e4ea0b21d0143d28fe280008d5 Author: David Goulet Date: Mon Feb 5 10:39:10 2018 -0500 geoip: Make geoip_client_cache_total_allocation() return the counter The HT_FOREACH() is insanely heavy on the CPU and this is part of the fast path

[tor-commits] [tor/maint-0.3.2] Add an address_set to the nodelist.

2018-02-16 Thread nickm
commit 6892d3292121d02900ac9968e832353ecacca4ad Author: Nick Mathewson Date: Thu Feb 8 12:14:42 2018 -0500 Add an address_set to the nodelist. This set is rebuilt whenever a consensus arrives. In between consensuses, it is add-only. ---

[tor-commits] [tor/maint-0.3.2] Fix a typo in an address_set.c comment.

2018-02-16 Thread nickm
commit 99fbbc6c478d346a469e61663a319c8cf03fec44 Author: Nick Mathewson Date: Mon Feb 12 10:59:46 2018 -0500 Fix a typo in an address_set.c comment. --- src/common/address_set.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

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

2018-02-16 Thread nickm
commit cb92d47deca15c44dd52cad6fc326520648c632e Merge: 2b99350ca e7f631478 Author: Nick Mathewson Date: Fri Feb 16 09:41:06 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9 changes/bug24952| 5 + changes/bug25223

[tor-commits] [tor/maint-0.3.2] Make check-changes happy

2018-02-16 Thread nickm
commit e7f631478254c38d6d8b1bea65840b4c6429e4f4 Author: David Goulet Date: Tue Feb 13 14:56:31 2018 -0500 Make check-changes happy Signed-off-by: David Goulet --- changes/bug25223| 3 ++- changes/ticket25202 | 2 +- 2 files

[tor-commits] [tor/release-0.2.9] dos: Add the DoSRefuseSingleHopClientRendezvous option

2018-02-16 Thread nickm
commit 36a0ae151f8f85c76b4bd91a8fc2871dd88b6005 Author: David Goulet Date: Thu Jan 25 16:32:28 2018 -0500 dos: Add the DoSRefuseSingleHopClientRendezvous option This option refuses any ESTABLISH_RENDEZVOUS cell arriving from a client connection. Its

[tor-commits] [tor/release-0.2.9] dos: Add the connection DoS mitigation subsystem

2018-02-16 Thread nickm
commit acf7ea77d8d76830924a14145afbcf3c95a06b0e Author: David Goulet Date: Thu Jan 25 16:28:54 2018 -0500 dos: Add the connection DoS mitigation subsystem Defend against an address that has reached the concurrent connection count threshold.

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

2018-02-16 Thread nickm
commit b60ffc5ce0fc9dfd4c2fbb238e32143c64fadbda Merge: 305e39d0f 4fe4f8179 Author: David Goulet Date: Tue Feb 13 13:11:10 2018 -0500 Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05 changes/bug25223 | 3 +++ src/or/dos.c | 8

[tor-commits] [tor/maint-0.3.2] Add an address-set backend using a bloom filter.

2018-02-16 Thread nickm
commit 46bd2aed915f17d520f9ff237262d1510fe25e12 Author: Nick Mathewson Date: Wed Feb 7 09:49:35 2018 -0500 Add an address-set backend using a bloom filter. We're going to need this to make our anti-DoS code (see 24902) more robust. ---

[tor-commits] [tor/maint-0.3.2] Have tor_addr hashes return a randomized hash for AF_UNSPEC.

2018-02-16 Thread nickm
commit 1555946e202fef523b35e169c90892b57caea766 Author: Nick Mathewson Date: Mon Feb 12 11:08:33 2018 -0500 Have tor_addr hashes return a randomized hash for AF_UNSPEC. We don't expect this to come up very much, but we may as well make sure that the value

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

2018-02-16 Thread nickm
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. ---

[tor-commits] [tor/maint-0.3.2] geoip: Increment and decrement functions for the geoip client cache

2018-02-16 Thread nickm
commit 4d812e29b9b1ec88fe268c150a826466b23a8762 Author: David Goulet Date: Fri Feb 2 13:14:50 2018 -0500 geoip: Increment and decrement functions for the geoip client cache These functions protect againts over and underflow. They BUG() in case we

[tor-commits] [tor/maint-0.3.2] test: DoS test to make sure we exclude known relays

2018-02-16 Thread nickm
commit 1a4fc9cddf27595db6f5da981a557f768fa32f66 Author: David Goulet Date: Fri Feb 9 11:31:01 2018 -0500 test: DoS test to make sure we exclude known relays Part of #25193 Signed-off-by: David Goulet ---

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

2018-02-16 Thread nickm
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 ---

[tor-commits] [tor/maint-0.3.2] test: Add unit tests for addressset.c

2018-02-16 Thread nickm
commit a445327b80478c72093d8f1b0e205a279318f651 Author: David Goulet Date: Thu Feb 8 14:35:22 2018 -0500 test: Add unit tests for addressset.c This also adds one that tests the integration with the nodelist. Signed-off-by: David Goulet

[tor-commits] [tor/maint-0.3.2] dos: Man page entry for DoS mitigation

2018-02-16 Thread nickm
commit a3714268f659998dc879ed723852440cd8be1b04 Author: David Goulet Date: Fri Jan 26 09:00:17 2018 -0500 dos: Man page entry for DoS mitigation Signed-off-by: David Goulet --- doc/tor.1.txt | 90

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

2018-02-16 Thread nickm
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.

[tor-commits] [tor/maint-0.3.2] dos: Add the connection DoS mitigation subsystem

2018-02-16 Thread nickm
commit acf7ea77d8d76830924a14145afbcf3c95a06b0e Author: David Goulet Date: Thu Jan 25 16:28:54 2018 -0500 dos: Add the connection DoS mitigation subsystem Defend against an address that has reached the concurrent connection count threshold.

[tor-commits] [tor/maint-0.3.2] geoip: Hook the client history cache into the OOM handler

2018-02-16 Thread nickm
commit 51839f47650463f59bd2cc84da05d5bc535d699d Author: David Goulet Date: Fri Feb 2 10:15:28 2018 -0500 geoip: Hook the client history cache into the OOM handler If the cache is using 20% of our maximum allowed memory, clean 10% of it. Same behavior

[tor-commits] [tor/maint-0.3.2] Use tt_u64_op() for uint64_t inputs.

2018-02-16 Thread nickm
commit 3bed8fdb91599b5e7c7946978c6221ba5db85463 Author: Nick Mathewson Date: Fri Feb 2 15:23:55 2018 -0500 Use tt_u64_op() for uint64_t inputs. --- src/test/test_dos.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_dos.c

[tor-commits] [tor/maint-0.3.2] dos: Add the DoSRefuseSingleHopClientRendezvous option

2018-02-16 Thread nickm
commit 36a0ae151f8f85c76b4bd91a8fc2871dd88b6005 Author: David Goulet Date: Thu Jan 25 16:32:28 2018 -0500 dos: Add the DoSRefuseSingleHopClientRendezvous option This option refuses any ESTABLISH_RENDEZVOUS cell arriving from a client connection. Its

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

2018-02-16 Thread nickm
commit 112638921b479f09bb473952c1870b27a0867971 Merge: 22a5d3dd2 a445327b8 Author: David Goulet Date: Thu Feb 8 16:56:21 2018 -0500 Merge branch 'ticket25183_029_01' into ticket24902_029_05 src/common/address.c| 22 ++ src/common/address.h|

[tor-commits] [tor/maint-0.3.2] dos: Exclude known relays from client connection count

2018-02-16 Thread nickm
commit 666582a679cdfb2d69620db6aadf55a57d430e23 Author: David Goulet Date: Fri Feb 9 11:11:41 2018 -0500 dos: Exclude known relays from client connection count This is to avoid positively identifying Exit relays if tor client connection comes from them

[tor-commits] [tor/maint-0.3.3] Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9

2018-02-16 Thread nickm
commit cb92d47deca15c44dd52cad6fc326520648c632e Merge: 2b99350ca e7f631478 Author: Nick Mathewson Date: Fri Feb 16 09:41:06 2018 -0500 Merge remote-tracking branch 'dgoulet/ticket24902_029_05' into maint-0.2.9 changes/bug24952| 5 + changes/bug25223

[tor-commits] [tor/maint-0.3.2] Function to add an ipv4 address to an address_set

2018-02-16 Thread nickm
commit 0640da42696a666382dd569839e98312d720a22a Author: Nick Mathewson Date: Thu Feb 8 12:13:56 2018 -0500 Function to add an ipv4 address to an address_set This is a convenience function, so callers don't need to wrap the IPv4 address. ---

[tor-commits] [tor/maint-0.3.2] test: Add unit tests for the DoS subsystem

2018-02-16 Thread nickm
commit c3c2b55decc80028728780422fe2766ec6517246 Author: George Kadianakis Date: Thu Jan 25 16:38:59 2018 -0500 test: Add unit tests for the DoS subsystem Signed-off-by: David Goulet --- src/or/channel.c| 4 +- src/or/channel.h

[tor-commits] [tor/maint-0.3.2] dos: Apply defense for circuit creation DoS

2018-02-16 Thread nickm
commit 1bfc91a029839f36e04c8204d1bccaa04a5c2afd Author: David Goulet Date: Thu Jan 25 16:20:52 2018 -0500 dos: Apply defense for circuit creation DoS If the client address was detected as malicious, apply a defense which is at this commit to return a

[tor-commits] [tor/maint-0.3.2] dos: We can put less token than the current amount

2018-02-16 Thread nickm
commit 78d6cb58707ff46464c591e45d81e83388427e2c Author: David Goulet Date: Fri Feb 2 17:04:12 2018 -0500 dos: We can put less token than the current amount Becasue the circuit creation burst and rate can change at runtime it is possible that between two

[tor-commits] [tor/release-0.3.2] test: DoS test to make sure we exclude known relays

2018-02-16 Thread nickm
commit 1a4fc9cddf27595db6f5da981a557f768fa32f66 Author: David Goulet Date: Fri Feb 9 11:31:01 2018 -0500 test: DoS test to make sure we exclude known relays Part of #25193 Signed-off-by: David Goulet ---

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

2018-02-16 Thread nickm
commit 2bcd264a28e2d6bec1e806e779bf82435c9c7505 Merge: 3930ffdf6 cb92d47de Author: Nick Mathewson Date: Fri Feb 16 09:48:11 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24952| 5 + changes/bug25223| 4 +

[tor-commits] [tor/release-0.3.2] geoip: Add clientmap_entry_new() function

2018-02-16 Thread nickm
commit e758d659a0bc8b9a0e2bd6a0126755fd1fb58e0a Author: David Goulet Date: Fri Feb 2 13:24:37 2018 -0500 geoip: Add clientmap_entry_new() function Signed-off-by: David Goulet --- src/or/geoip.c | 32 ++--

[tor-commits] [tor/release-0.3.2] geoip: Hook the client history cache into the OOM handler

2018-02-16 Thread nickm
commit 51839f47650463f59bd2cc84da05d5bc535d699d Author: David Goulet Date: Fri Feb 2 10:15:28 2018 -0500 geoip: Hook the client history cache into the OOM handler If the cache is using 20% of our maximum allowed memory, clean 10% of it. Same behavior

[tor-commits] [tor/release-0.3.2] dos: We can put less token than the current amount

2018-02-16 Thread nickm
commit 78d6cb58707ff46464c591e45d81e83388427e2c Author: David Goulet Date: Fri Feb 2 17:04:12 2018 -0500 dos: We can put less token than the current amount Becasue the circuit creation burst and rate can change at runtime it is possible that between two

[tor-commits] [tor/release-0.3.2] test: Add unit tests for addressset.c

2018-02-16 Thread nickm
commit a445327b80478c72093d8f1b0e205a279318f651 Author: David Goulet Date: Thu Feb 8 14:35:22 2018 -0500 test: Add unit tests for addressset.c This also adds one that tests the integration with the nodelist. Signed-off-by: David Goulet

[tor-commits] [tor/release-0.3.2] dos: Exclude known relays from client connection count

2018-02-16 Thread nickm
commit 666582a679cdfb2d69620db6aadf55a57d430e23 Author: David Goulet Date: Fri Feb 9 11:11:41 2018 -0500 dos: Exclude known relays from client connection count This is to avoid positively identifying Exit relays if tor client connection comes from them

[tor-commits] [tor/release-0.3.2] dos: Don't set consensus param if we aren't a public relay

2018-02-16 Thread nickm
commit 4fe4f8179fe81244319c7fdec64299b6506434a2 Author: David Goulet Date: Tue Feb 13 10:29:41 2018 -0500 dos: Don't set consensus param if we aren't a public relay We had this safeguard around dos_init() but not when the consensus changes which can

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

2018-02-16 Thread nickm
commit 2bcd264a28e2d6bec1e806e779bf82435c9c7505 Merge: 3930ffdf6 cb92d47de Author: Nick Mathewson Date: Fri Feb 16 09:48:11 2018 -0500 Merge branch 'maint-0.2.9' into maint-0.3.1 changes/bug24952| 5 + changes/bug25223| 4 +

[tor-commits] [tor/release-0.3.2] Make check-changes happy

2018-02-16 Thread nickm
commit e7f631478254c38d6d8b1bea65840b4c6429e4f4 Author: David Goulet Date: Tue Feb 13 14:56:31 2018 -0500 Make check-changes happy Signed-off-by: David Goulet --- changes/bug25223| 3 ++- changes/ticket25202 | 2 +- 2 files

[tor-commits] [tor/release-0.3.2] dos: Add extra safety asserts in cc_stats_refill_bucket()

2018-02-16 Thread nickm
commit 305e39d0f8bcc39d45c2877495046bd927347106 Author: David Goulet Date: Tue Feb 13 10:41:21 2018 -0500 dos: Add extra safety asserts in cc_stats_refill_bucket() Never allow the function to set a bucket value above the allowed circuit burst.

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

2018-02-16 Thread nickm
commit bd71e0a0c8ccf684c40201f08c456596eac60887 Merge: c67adddac 2bcd264a2 Author: Nick Mathewson Date: Fri Feb 16 09:54:13 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/bug24952| 5 + changes/bug25223| 4 +

[tor-commits] [tor/release-0.3.2] Have tor_addr hashes return a randomized hash for AF_UNSPEC.

2018-02-16 Thread nickm
commit 1555946e202fef523b35e169c90892b57caea766 Author: Nick Mathewson Date: Mon Feb 12 11:08:33 2018 -0500 Have tor_addr hashes return a randomized hash for AF_UNSPEC. We don't expect this to come up very much, but we may as well make sure that the value

[tor-commits] [tor/release-0.3.2] geoip: Make geoip_client_cache_total_allocation() return the counter

2018-02-16 Thread nickm
commit f08fa974600625e4ea0b21d0143d28fe280008d5 Author: David Goulet Date: Mon Feb 5 10:39:10 2018 -0500 geoip: Make geoip_client_cache_total_allocation() return the counter The HT_FOREACH() is insanely heavy on the CPU and this is part of the fast path

[tor-commits] [tor/release-0.3.2] Add an address-set backend using a bloom filter.

2018-02-16 Thread nickm
commit 46bd2aed915f17d520f9ff237262d1510fe25e12 Author: Nick Mathewson Date: Wed Feb 7 09:49:35 2018 -0500 Add an address-set backend using a bloom filter. We're going to need this to make our anti-DoS code (see 24902) more robust. ---

[tor-commits] [tor/release-0.3.2] Use tt_u64_op() for uint64_t inputs.

2018-02-16 Thread nickm
commit 3bed8fdb91599b5e7c7946978c6221ba5db85463 Author: Nick Mathewson Date: Fri Feb 2 15:23:55 2018 -0500 Use tt_u64_op() for uint64_t inputs. --- src/test/test_dos.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test_dos.c

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

2018-02-16 Thread nickm
commit 112638921b479f09bb473952c1870b27a0867971 Merge: 22a5d3dd2 a445327b8 Author: David Goulet Date: Thu Feb 8 16:56:21 2018 -0500 Merge branch 'ticket25183_029_01' into ticket24902_029_05 src/common/address.c| 22 ++ src/common/address.h|

[tor-commits] [tor/release-0.3.2] channel_tls_get_remote_addr_method now returns real_addr.

2018-02-16 Thread nickm
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.

[tor-commits] [tor/release-0.3.2] Add an address_set to the nodelist.

2018-02-16 Thread nickm
commit 6892d3292121d02900ac9968e832353ecacca4ad Author: Nick Mathewson Date: Thu Feb 8 12:14:42 2018 -0500 Add an address_set to the nodelist. This set is rebuilt whenever a consensus arrives. In between consensuses, it is add-only. ---

[tor-commits] [tor/release-0.3.2] Function to add an ipv4 address to an address_set

2018-02-16 Thread nickm
commit 0640da42696a666382dd569839e98312d720a22a Author: Nick Mathewson Date: Thu Feb 8 12:13:56 2018 -0500 Function to add an ipv4 address to an address_set This is a convenience function, so callers don't need to wrap the IPv4 address. ---

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05

2018-02-16 Thread nickm
commit b60ffc5ce0fc9dfd4c2fbb238e32143c64fadbda Merge: 305e39d0f 4fe4f8179 Author: David Goulet Date: Tue Feb 13 13:11:10 2018 -0500 Merge remote-tracking branch 'dgoulet/bug25223_029_01' into ticket24902_029_05 changes/bug25223 | 3 +++ src/or/dos.c | 8

  1   2   3   4   >