]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'ticket29533_squashed'
authorNick Mathewson <nickm@torproject.org>
Mon, 17 Jun 2019 12:56:13 +0000 (08:56 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 17 Jun 2019 12:56:13 +0000 (08:56 -0400)
1  2 
scripts/git/pre-push.git-hook

Simple merge