commit 8b7922b2829033d910a98a9d1a4e4ebf9d02d7b4 Merge: 4f4e995 16085a8 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 14 10:18:41 2016 -0400 Merge remote-tracking branch 'teor/feature20072' changes/feature20072 | 5 +++++ src/test/include.am | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-)