From d78a838b1f14bd3368a7355472732937ea6b5385 Mon Sep 17 00:00:00 2001
From: Leah Rowe <info@minifree.org>
Date: Fri, 15 Jul 2016 13:51:14 -0400
Subject: backport changes from master branch

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

--
cgit v0.9.1