aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorNikhil Soni <krsoninikhil@gmail.com>2017-03-03 12:58:44 +0530
committerGitHub <noreply@github.com>2017-03-03 12:58:44 +0530
commit0081d9b82807b178bd6d00ca250d38aeeeed2d33 (patch)
tree8d244a7b9ade13f0e1836f8eb9fbc534a1cc662d /docs
parent3da8532bed3305b01e3f3ab556f9dbc652177c6b (diff)
parentbae4cdf8d5cc434938c74a041f762075513dd8e4 (diff)
downloadmitmproxy-0081d9b82807b178bd6d00ca250d38aeeeed2d33.tar.gz
mitmproxy-0081d9b82807b178bd6d00ca250d38aeeeed2d33.tar.bz2
mitmproxy-0081d9b82807b178bd6d00ca250d38aeeeed2d33.zip
Merge branch 'master' into on-issues
Diffstat (limited to 'docs')
-rw-r--r--docs/certinstall.rst12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/certinstall.rst b/docs/certinstall.rst
index 5d97e92c..1bd6df99 100644
--- a/docs/certinstall.rst
+++ b/docs/certinstall.rst
@@ -42,7 +42,7 @@ iOS
See http://jasdev.me/intercepting-ios-traffic
-and http://web.archive.org/web/20150920082614/http://kb.mit.edu/confluence/pages/viewpage.action?pageId=152600377
+and https://web.archive.org/web/20150920082614/http://kb.mit.edu/confluence/pages/viewpage.action?pageId=152600377
iOS Simulator
^^^^^^^^^^^^^
@@ -52,7 +52,7 @@ See https://github.com/ADVTOOLS/ADVTrustStore#how-to-use-advtruststore
Java
^^^^
-See http://docs.oracle.com/cd/E19906-01/820-4916/geygn/index.html
+See https://docs.oracle.com/cd/E19906-01/820-4916/geygn/index.html
Android/Android Simulator
^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -62,7 +62,7 @@ See http://wiki.cacert.org/FAQ/ImportRootCert#Android_Phones_.26_Tablets
Windows
^^^^^^^
-See http://windows.microsoft.com/en-ca/windows/import-export-certificates-private-keys#1TC=windows-7
+See https://web.archive.org/web/20160612045445/http://windows.microsoft.com/en-ca/windows/import-export-certificates-private-keys#1TC=windows-7
Windows (automated)
^^^^^^^^^^^^^^^^^^^
@@ -79,7 +79,7 @@ See https://support.apple.com/kb/PH7297?locale=en_US
Ubuntu/Debian
^^^^^^^^^^^^^
-See http://askubuntu.com/questions/73287/how-do-i-install-a-root-certificate/94861#94861
+See https://askubuntu.com/questions/73287/how-do-i-install-a-root-certificate/94861#94861
Mozilla Firefox
^^^^^^^^^^^^^^^
@@ -89,7 +89,7 @@ See https://wiki.mozilla.org/MozillaRootCertificate#Mozilla_Firefox
Chrome on Linux
^^^^^^^^^^^^^^^
-See https://code.google.com/p/chromium/wiki/LinuxCertManagement
+See https://stackoverflow.com/a/15076602/198996
The mitmproxy certificate authority
@@ -205,4 +205,4 @@ directory and uses this as the client cert.
-.. _Certificate Pinning: http://security.stackexchange.com/questions/29988/what-is-certificate-pinning/
+.. _Certificate Pinning: https://security.stackexchange.com/questions/29988/what-is-certificate-pinning/