Skip to content

Commit

Permalink
Merge branch 'master' into analysis-view
Browse files Browse the repository at this point in the history
  • Loading branch information
thisismyrobot committed Jul 2, 2016
2 parents 11bae99 + c7f0ac2 commit 1ac6005
Showing 1 changed file with 18 additions and 9 deletions.
27 changes: 18 additions & 9 deletions dnstwister/static/privacy.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<h1>Privacy statement</h1>
<p>

<a href="https://github.com/thisismyrobot/dnstwister/commits/heroku-deploy/dnstwister/static/privacy.html" target="_blank">Last updated 16/04/2016</a>
<a href="https://github.com/thisismyrobot/dnstwister/commits/heroku-deploy/dnstwister/static/privacy.html" target="_blank">Last updated 02/07/2016</a>

</p>

Expand Down Expand Up @@ -41,14 +41,14 @@ <h3>Email addresses and domain names</h3>
anyone can request information about a particular domain.

</p>

<h3>Logs</h3>
<p>

The <a href="https://devcenter.heroku.com/articles/logging#view-logs" target="_blank">minimal logs</a>
generated by the <strong>dnstwister</strong> web application are
not kept in persistent storage. They will only be reviewed in
real-time by the developer to troubleshoot production-site issues.
These logs will never be shared with a third party by the
developer.
The logs generated by the <strong>dnstwister</strong> web
application are archived in Papertrail. They will only be reviewed
by the developer to troubleshoot production-site issues. These
logs will never be shared with any other party.

</p>

Expand Down Expand Up @@ -81,8 +81,8 @@ <h2>How we use your personal information</h2>

If you unsubscribe from receiving email alerts for a domain, we
permanently delete this mapping. If there are no requests for the
Atom feed for a domain for seven days the domain's information is
also permanently deleted.
Atom feed for a domain for seven days then that domain's
information is also permanently deleted.

</p>

Expand Down Expand Up @@ -133,5 +133,14 @@ <h3>CloudFlare</h3>

</p>
<a href="https://www.cloudflare.com/security-policy/" target="_blank">CloudFlare Privacy &amp; Security Policy</a>


<h3>Papertrail</h3>
<p>

<strong>dnstwister</strong> uses Papertrail for log archiving.

</p>
<a href="https://papertrailapp.com/info/terms" target="_blank">Papertrail Software Services Agreement</a>
</body>
</html>

0 comments on commit 1ac6005

Please sign in to comment.