[tor-commits] [tpo/staging] Merge branch 'master' into master

[emmapeel@xxxxxxxxxxxxxx]

commit 7918445fe7278ed0d932d14fa8adc30ba9c770a5
Merge: cdf2cea 028a442
Author: Antonela <hola@xxxxxxxxxxx>
Date:   Wed Mar 27 11:48:24 2019 -0300

    Merge branch 'master' into master

 .htaccess                                     | 6 +++---
 content/about/sponsors/DARPA-penn/contents.lr | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc content/about/sponsors/DARPA-penn/contents.lr
index d93001f,ffcf88e..dd73dca
--- a/content/about/sponsors/DARPA-penn/contents.lr
+++ b/content/about/sponsors/DARPA-penn/contents.lr
@@@ -16,4 -16,4 +16,4 @@@ link: https://www.darpa.mil/program/ext
  ---
  description:
  
- DARPA's Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks. This contracts supports our work addressing denial of service attacks on free and open communication on the internet.
 -DARPAâ??s Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks. This contract supports our work addressing denial of service attacks on free and open communication on the internet.
++DARPAâ??s Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks. This contract supports our work addressing denial of service attacks on free and open communication on the internet.



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits