commit df8e2bbc0f3b361e1d5beb8c00d076e2c9788046 Merge: 1190636f2 fb91e1c6e Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 10 09:38:40 2019 -0400

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

changes/ticket30550 | 2 + configure.ac | 1 - contrib/dist/torctl.in | 195 ------------------------------------------------- contrib/include.am | 1 - 4 files changed, 2 insertions(+), 197 deletions(-)