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

[asn at torproject.org]

commit a7986755eee19b948c46f0b43ad3f6174071bd79
Merge: e5ad6fb09 66eae4aff
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Jun 11 14:12:22 2019 +0300

    Merge branch 'tor-github/pr/1060'

 changes/ticket27530 |  4 ++++
 configure.ac        | 11 +++++++++++
 2 files changed, 15 insertions(+)