[tor-commits] [tor/master] Merge remote-tracking branch 'teor/feature20069'

[nickm at torproject.org]

commit 43092e21c1874086076aa910fc2cba843bcaed39
Merge: 128f7ff 26b47f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 6 19:06:32 2016 -0400

    Merge remote-tracking branch 'teor/feature20069'

 changes/feature20069 | 6 ++++++
 src/test/include.am  | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)