From 1956b960f0fd3e9c59e9034537e7f675fb621d4e Mon Sep 17 00:00:00 2001
From: Leah Woods <info@minifree.org>
Date: Sun, 22 May 2016 00:52:17 -0400
Subject: backport changes to master branch

---
(limited to 'docs/src/security')

--
cgit v0.9.1