[tor-commits] [tor/master] Merge branch 'tor-github/pr/985'

[asn at torproject.org]

commit f2800b53ad08abb867a3e31590f03f92f9f17807
Merge: d885ed867 6d347fe32
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Apr 30 19:25:32 2019 +0300

    Merge branch 'tor-github/pr/985'

 changes/ticket30076         |   2 +
 configure.ac                |   1 -
 contrib/README              |   2 -
 contrib/dist/suse/tor.sh.in | 118 --------------------------------------------
 contrib/include.am          |   1 -
 5 files changed, 2 insertions(+), 122 deletions(-)