[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/964'

commit 0cbe0f9cabd1af990ae1b0f3b430b9b9a68f3e6d Merge: d0a0f3e8c 0d88b808e Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 24 17:05:20 2019 -0400

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

changes/ticket30075 | 3 ++ configure.ac | 1 - contrib/dist/tor.sh.in | 123 ------------------------------------------------- contrib/include.am | 1 - 4 files changed, 3 insertions(+), 125 deletions(-)