diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-07-13 10:45:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-07-13 10:45:04 -0400 |
| commit | ecb43ce21caccbdfe99b0e12cdce7f83d59b06e3 (patch) | |
| tree | 972dfab41d90ef357b5f0881bb8a646f7896f23a /contrib | |
| parent | 0c91c63593720f07a20034bce2b0478dee216763 (diff) | |
| parent | eb427f309cbe2eb82769fdec4e9b7a7249c3287b (diff) | |
| download | tor-ecb43ce21caccbdfe99b0e12cdce7f83d59b06e3.tar.gz tor-ecb43ce21caccbdfe99b0e12cdce7f83d59b06e3.zip | |
Merge branch 'maint-0.4.4'
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/clang/sanitize_blacklist.txt | 4 | ||||
| -rw-r--r-- | contrib/operator-tools/tor-exit-notice.html | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/clang/sanitize_blacklist.txt b/contrib/clang/sanitize_blacklist.txt index c71cc4d878..2ce787975b 100644 --- a/contrib/clang/sanitize_blacklist.txt +++ b/contrib/clang/sanitize_blacklist.txt @@ -1,6 +1,6 @@ # clang sanitizer special case list -# syntax specified in http://clang.llvm.org/docs/SanitizerSpecialCaseList.html -# for more info see http://clang.llvm.org/docs/AddressSanitizer.html +# syntax specified in https://clang.llvm.org/docs/SanitizerSpecialCaseList.html +# for more info see https://clang.llvm.org/docs/AddressSanitizer.html # # Tor notes: This file is obsolete! diff --git a/contrib/operator-tools/tor-exit-notice.html b/contrib/operator-tools/tor-exit-notice.html index f0f9a6344c..278d3de502 100644 --- a/contrib/operator-tools/tor-exit-notice.html +++ b/contrib/operator-tools/tor-exit-notice.html @@ -254,7 +254,7 @@ seize this router will accomplish nothing.</p> <p> Furthermore, this machine also serves as a carrier of email, which means that its contents are further protected under the ECPA. <a -href="http://www.law.cornell.edu/uscode/text/18/2707">18 +href="https://www.law.cornell.edu/uscode/text/18/2707">18 USC 2707</a> explicitly allows for civil remedies ($1000/account <i><b>plus</b></i> legal fees) in the event of a seizure executed without good faith or probable cause (it @@ -272,7 +272,7 @@ used to violate the DMCA, please be aware that this machine does not host or contain any illegal content. Also be aware that network infrastructure maintainers are not liable for the type of content that passes over their equipment, in accordance with <a -href="http://www.law.cornell.edu/uscode/text/17/512">DMCA +href="https://www.law.cornell.edu/uscode/text/17/512">DMCA "safe harbor" provisions</a>. In other words, you will have just as much luck sending a takedown notice to the Internet backbone providers. Please consult <a href="https://www.torproject.org/eff/tor-dmca-response">EFF's prepared |