commit e6bb23434e86f65b72b51f4c1d1bb886cbb79d37 Merge: 2c97cf3ad 11b5946e4 Author: teor teor@torproject.org Date: Thu Oct 17 13:47:42 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1419'

Obviously correct fixes to code that's already been reviewed.

scripts/git/git-merge-forward.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)