commit 26539ec3ae01a33f0ab4ce59fa83355ebdf32470 Merge: 48b08f059 8cb817cc5 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 19 08:45:41 2018 -0500

Merge remote-tracking branch 'tor-github/pr/518'

changes/ticket28008 | 3 +++ scripts/test/coverage | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-)