Merge master and fix conflicts

config/appPermissions.js

@@ -1,6 +1,6 @@
 export default {
   id: 'appPermissions',
-  title: 'Review app permissions on your devices',
+  title: 'Review location, camera, and other sensitive device permissions',
   description: `You should review all applications that have access to your photos, camera, location, and microphone. Ensure that you trust apps with sensitive permissions.
   `,
   resources: [
@@ -9,6 +9,11 @@ export default {
         'iOS camera permissions allow rogue apps to surreptitiously photograph & video users',
       url: 'https://9to5mac.com/2017/10/26/ios-camera-permissions-abuse/',
     },
+    {
+      name: 'How to stop your iPhone from tracking locations you frequently visit',
+      url:
+        'https://www.imore.com/stop-iphone-tracking-frequent-locations',
+    },
     {
       name: 'How to manage app permissions on iOS',
       url:

config/browsers.js

@@ -48,9 +48,10 @@ export default {
       url: 'https://www.torproject.org/',
       sources: {
         windows:
-          'https://www.torproject.org/projects/torbrowser.html.en#windows',
-        macos: 'https://www.torproject.org/projects/torbrowser.html.en#macosx',
-        linux: 'https://www.torproject.org/docs/tor-doc-unix.html.en',
+          'https://www.torproject.org/download/download-easy.html#windows',
+        macos: 'https://www.torproject.org/download/download-easy.html#mac',
+        linux: 'https://www.torproject.org/download/download-easy.html#linux',
+        android: 'https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alpha',
       },
     },
     {

config/data.js

@@ -13,7 +13,7 @@ import appPermissions from './appPermissions';
 import socialMedia from './socialMedia';
 import phishing from './phishing';
 import webcam from './webcam';
-import privacyScreen from './privacyScreen';
+import geotagging from './geotagging';
 
 export default {
   passwordManager,
@@ -24,12 +24,12 @@ export default {
   creditFreeze,
   dns,
   vpn,
-  privacyScreen,
   webcam,
   browsers,
   searchEngine,
   email,
   appPermissions,
+  geotagging,
   socialMedia,
   phishing,
 };

config/geotagging.js

@@ -0,0 +1,36 @@
+export default {
+  id: 'geotagging',
+  title: 'Review and remove metadata attached to photos you share',
+  description: `Geotagging is the process of adding geographical identification to media files (photos and videos, for example). Anyone who has access to these tagged media files (for example, on Instagram or Twitter) can read this data and learn where the photo was taken.
+
+  \n\nYou should understand how location metadata is attached to your media and take steps to ensure you are not uploading sensitive information with your files.
+  `,
+  resources: [
+    {
+      name: 'Geotagging',
+      url: 'https://en.wikipedia.org/wiki/Geotagging',
+    },
+    {
+      name: 'What is geotag security and how it helps to protect your family',
+      url: 'https://www.geotag-security.com/',
+    },
+    {
+      name: 'Web photos that reveal secrets, like where you live',
+      url:
+        'https://www.nytimes.com/2010/08/12/technology/personaltech/12basics.html',
+    },
+    {
+      name: 'How to avoid the potential risks of geotagging',
+      url: 'https://www.wikihow.com/Avoid-the-Potential-Risks-of-Geotagging',
+    },
+    {
+      name: 'How to turn off geotagging for photos on iPhone and iPad',
+      url:
+        'https://www.techbout.com/turn-off-geotagging-for-photos-iphone-ipad-8738/',
+    },
+    {
+      name: 'How To turn off geotagging on Android devices',
+      url: 'https://www.technobezz.com/turn-off-geotagging-android-devices/',
+    },
+  ],
+};

config/passwordManager.js

@@ -68,6 +68,17 @@ export default {
           'https://vault.bitwarden.com/download/?app=desktop&platform=linux',
       },
     },
+    {
+      name: 'Avast Passwords',
+      image: '/static/img/avast-passwords.png',
+      url: 'https://www.avast.com/passwords',
+      sources: {
+        windows: 'https://www.avast.com/passwords#pc',
+        macos: 'https://www.avast.com/passwords#mac',
+        ios: 'https://www.avast.com/passwords#ios',
+        android: 'https://www.avast.com/passwords#android',
+      },
+    },
   ],
   resources: [
     {

config/strongDevicePasscode.js

@@ -1,12 +1,16 @@
 export default {
   id: 'strongDevicePasscode',
   title: 'Create a strong device passcode',
-  description: `A four-digit passcode for your phone or other devices is no longer considered secure. You should use a 6+ digit passcode at the very minimum, and for extra security use a 6+ character passcode containing both numbers and letters.`,
+  description: `A four-digit passcode for your phone or other devices is no longer considered secure. You should use a 6+ digit passcode at the very minimum, and for extra security use a 6+ character passcode containing both numbers and letters. TouchID and FaceID should be turned off when traveling internationally.`,
   resources: [
     {
       name: 'How long it takes to break a passcode',
       url: 'http://fortune.com/2016/03/18/apple-fbi-iphone-passcode-hack/',
     },
+    {
+      name: 'How to temporarily disable TouchID or FaceID',
+      url: 'https://www.iphonelife.com/content/how-to-temporarily-disable-touch-id-or-face-id-your-iphone',
+    },
     {
       name: 'Changing your iOS passcode',
       url: 'https://support.apple.com/en-us/HT204060',

config/twoFactor.js

@@ -12,6 +12,22 @@ export default {
     \n\n**Note:** Using an all-in-one solution like 1Password for both password management *and* 2FA creates a single point of failure. Take this into account when picking your 2FA client.
     `,
   apps: [
+    {
+      name: '1Password',
+      image: '/static/img/1password.jpg',
+      url: 'https://1password.com/',
+      offer: {
+        label: 'Sign up with Security Checklist to get 3 months free',
+        url: 'https://start.1password.com/sign-up/family?c=SECURELIST-FJN7FIKQ',
+      },
+      sources: {
+        windows: 'https://1password.com/downloads/windows/',
+        macos: 'https://1password.com/downloads/mac/',
+        ios: 'https://1password.com/downloads/ios/',
+        android: 'https://1password.com/downloads/android/',
+        linux: 'https://1password.com/downloads/linux/',
+      },
+    },
     {
       name: 'Authy',
       image: '/static/img/authy.jpg',
@@ -34,22 +50,6 @@ export default {
           'https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en_us',
       },
     },
-    {
-      name: '1Password',
-      image: '/static/img/1password.jpg',
-      url: 'https://1password.com/',
-      offer: {
-        label: 'Sign up with Security Checklist to get 3 months free',
-        url: 'https://start.1password.com/sign-up/family?c=SECURELIST-FJN7FIKQ',
-      },
-      sources: {
-        windows: 'https://1password.com/downloads/windows/',
-        macos: 'https://1password.com/downloads/mac/',
-        ios: 'https://1password.com/downloads/ios/',
-        android: 'https://1password.com/downloads/android/',
-        linux: 'https://1password.com/downloads/linux/',
-      },
-    },
     {
       name: 'LastPass',
       image: '/static/img/lastpass.jpg',
@@ -65,6 +65,16 @@ export default {
         linux: 'https://lastpass.com/misc_download2.php',
       },
     },
+    {
+      name: 'Microsoft Authenticator',
+      image: '/static/img/static/img/microsoft_authenticator_80.png',
+      url: 'https://www.microsoft.com/en-us/account/authenticator',
+      sources: {
+        ios:
+          'https://itunes.apple.com/app/microsoft-authenticator/id983156458',
+        android: 'https://play.google.com/store/apps/details?id=com.azure.authenticator',
+      },
+    },
     {
       name: 'YubiKey',
       image: '/static/img/yubico.jpg',

config/vpn.js

@@ -55,6 +55,20 @@ export default {
         linux: 'https://nordvpn.com/tutorials/linux/',
       },
     },
+    {
+      name: 'ProtonVPN',
+      image: '/static/img/protonvpn.jpg',
+      url: 'https://www.protonvpn.com/',
+      sources: {
+        windows: 'https://protonvpn.com/download/',
+        macos: 'https://protonvpn.com/download/',
+        ios:
+          'https://itunes.apple.com/us/app/protonvpn-fast-secure-vpn/id1437005085',
+        android:
+          'https://play.google.com/store/apps/details?id=com.protonvpn.android',
+        linux: 'https://protonvpn.com/download/#dl-clients',
+      },
+    },
   ],
   resources: [
     {
@@ -72,5 +86,10 @@ export default {
       url:
         'https://www.macworld.com/article/3322951/security/why-you-should-use-a-vpn-on-a-public-wi-fi-network.html',
     },
+    {
+      name: 'A detailed VPN provider comparison chart',
+      url:
+        'https://thatoneprivacysite.net/vpn-comparison-chart/',
+    },
   ],
 };