commit af36af1a9b857772fb6dac2b413850ce8e02bdee Merge: 1239e411a 4e3880607 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 19 11:32:33 2019 -0500

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

changes/ticket29071 | 3 +++ contrib/dirauth-tools/nagios-check-tor-authority-cert | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-)