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

[asn at torproject.org]

commit 438b7eec856b0caced7112dd0c87a8dae8df0c75
Merge: 96fade0a7 396134188
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Jun 12 13:02:49 2019 +0300

    Merge branch 'tor-github/pr/1099'

 changes/bug30840                 | 4 ++++
 changes/bug30841                 | 3 +++
 scripts/git/git-merge-forward.sh | 6 +++---
 scripts/git/git-pull-all.sh      | 6 +++---
 scripts/git/git-push-all.sh      | 2 +-
 scripts/git/pre-commit.git-hook  | 2 +-
 scripts/git/pre-push.git-hook    | 2 +-
 7 files changed, 16 insertions(+), 9 deletions(-)