summaryrefslogtreecommitdiff
path: root/scripts/git/git-merge-forward.sh
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-06 11:20:02 +1000
committerteor <teor@torproject.org>2019-11-06 11:20:02 +1000
commit9ca25f3a68374ca4787b4eaa8bf4fb3365061d26 (patch)
treebb5f24f5fd30419fc53d7bcde83ab0fb653b797d /scripts/git/git-merge-forward.sh
parent884056ae57fb1dd80b39c9e503306c02732a551d (diff)
parent76fd872db88782c6bce1b539e27ba1d1ab88cbdb (diff)
downloadtor-9ca25f3a68374ca4787b4eaa8bf4fb3365061d26.tar.gz
tor-9ca25f3a68374ca4787b4eaa8bf4fb3365061d26.zip
Merge branch 'maint-0.4.2'
Diffstat (limited to 'scripts/git/git-merge-forward.sh')
0 files changed, 0 insertions, 0 deletions