From e9be5e2f10ca48c9e498bf072e3680d242bb17fa Mon Sep 17 00:00:00 2001
From: Leah Woods <info@minifree.org>
Date: Fri, 27 May 2016 17:04:08 -0400
Subject: backport changes to master branch

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

--
cgit v0.9.1