commit a8df39e9552bd679b35513fa4a1c98507e870082 Merge: 26539ec3a d9f7cb3f6 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 19 08:47:03 2018 -0500

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

changes/ticket28009 | 3 +++ scripts/test/cov-diff | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)