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

[nickm at torproject.org]

commit 2a49b27b9ff08e9b20fc2ab9a73b4286104d874e
Merge: a80131765 34b562b78
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 19 10:22:31 2019 -0400

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

 changes/ticket29434                      |   3 +
 contrib/include.am                       |   1 -
 contrib/operator-tools/linux-tor-prio.sh | 192 -------------------------------
 3 files changed, 3 insertions(+), 193 deletions(-)