commit 91f04d006bb850736df587e2942fedcc26d3dca9 Merge: ab1f82ea2 59e523f05 Author: George Kadianakis desnacked@riseup.net Date: Wed Jul 24 12:29:57 2019 +0300

Merge branch 'tor-github/pr/1165'

changes/bug31040 | 3 +++ scripts/git/post-merge.git-hook | 6 ++++++ 2 files changed, 9 insertions(+)