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

commit 26b0d95397987a4458cc8afc4142b70f9f797870 Merge: 58fd864a8 0befdb8a3 Author: George Kadianakis desnacked@riseup.net Date: Wed Mar 13 16:07:19 2019 +0200

Merge branch 'tor-github/pr/780'

changes/ticket29588 | 4 +++ scripts/{maint => git}/git-merge-forward.sh | 0 scripts/{maint => git}/git-pull-all.sh | 0 scripts/{maint => git}/git-push-all.sh | 0 scripts/git/post-merge.git-hook | 45 +++++++++++++++++++++++++++++ scripts/{maint => git}/pre-commit.git-hook | 0 scripts/{maint => git}/pre-push.git-hook | 0 7 files changed, 49 insertions(+)