[tor-commits] [community/staging] Merge branch 'captcha'

[hiro at torproject.org]

commit 5858da87d5d39692ee6e4efa48072be77a195e36
Merge: 2f66f49 1bd7c21
Author: gus <gus at torproject.org>
Date:   Tue Dec 15 17:44:00 2020 -0500

    Merge branch 'captcha'

 content/gsoc/cloudflare-captcha-monitoring/contents.lr | 18 +++++++++---------
 .../tor-abuse-templates/contents.lr                    | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --cc content/relay-operations/community-resources/tor-abuse-templates/contents.lr
index 483cb2c,6b4549e..1cd12f9
--- a/content/relay-operations/community-resources/tor-abuse-templates/contents.lr
+++ b/content/relay-operations/community-resources/tor-abuse-templates/contents.lr
@@@ -100,10 -100,10 +100,10 @@@ https://check.torproject.org/cgi-bin/To
  
  In general however, we believe that problems like this are best solved by improving the service to defend against the attack from the Internet at large.
  
- Scraping and robot activity can be reduced/slowed by captchas, which is the approach taken by Gmail for this same problem.
- In fact, Google provides a free captcha service, complete with code for easy inclusion in a number of systems to help other sites deal with this issue: https://code.google.com/apis/recaptcha/intro.html
+ Scraping and robot activity can be reduced/slowed by Captchas, which is the approach taken by Gmail for this same problem.
+ In fact, Google provides a free Captcha service, complete with code for easy inclusion in a number of systems to help other sites deal with this issue: https://code.google.com/apis/recaptcha/intro.html
  
 -Slow DoS attacks [aimed to consume the Apache MaxClients limit](http://www.guerilla-ciso.com/archives/2049) can be alleviated by reducing the httpd.conf TimeOut and KeepAliveTimeout config values to 15-30 and raising the ServerLimit and MaxClients values to omething like 3000.
 +Slow DoS attacks [aimed to consume the Apache MaxClients limit](http://www.guerilla-ciso.com/archives/2049) can be alleviated by reducing the httpd.conf TimeOut and KeepAliveTimeout config values to 15-30 and raising the ServerLimit and MaxClients values to something like 3000.
  
  If this fails, DoS attempts can also be solved with iptables-based rate limiting solutions, load balancers such as nginx, and also IPS devices, but be aware that Internet traffic is not always uniform in quantity by IP, due to large corporate and even national outproxies, NATs, and services like Tor.
  http://kevin.vanzonneveld.net/techblog/article/block_brute_force_attacks_with_iptables/