commit 7edd01a29bb772e09fccb4296c47c6bfd834e0e5 Merge: a57296da3 6b136c18e Author: George Kadianakis desnacked@riseup.net Date: Wed Jun 26 10:56:08 2019 +0300

Merge branch 'tor-github/pr/1109'

Makefile.am | 19 +++++++++++-------- changes/bug30455 | 5 +++++ 2 files changed, 16 insertions(+), 8 deletions(-)