[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/87'

Wed Jul 29 13:40:46 UTC 2020

commit 66657139678740dc83cfbc1b0d45fd1cd5d69ee7
Merge: 109063185b 915af1a65b
Author: Alexander FÃ¦rÃ¸y <ahf at torproject.org>
Date:   Wed Jul 29 13:39:59 2020 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/87'

 changes/ticket30797         |  5 +++++
 configure.ac                |  1 -
 contrib/README              |  2 --
 contrib/dist/tor.service.in | 35 -----------------------------------
 contrib/include.am          |  1 -
 5 files changed, 5 insertions(+), 39 deletions(-)