From: Jennifer Richards <jennifer@painless-security.com>
Date: Tue, 11 Jul 2017 15:01:57 +0000 (-0400)
Subject: Merge fixes from jennifer/filter-dev branch
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=commitdiff_plain;h=a3c6cbaf3003fc86851f84c3640e9b454420ba38

Merge fixes from jennifer/filter-dev branch
---

a3c6cbaf3003fc86851f84c3640e9b454420ba38