]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bb0ca1 21c3488)
Merge branch 'maint-0.3.5' into maint-0.4.0
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 16:10:30 +0000 (12:10 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Oct 2019 16:10:30 +0000 (12:10 -0400)
1  2 
.appveyor.yml patch | diff1 | diff2 | blob | history

diff --cc .appveyor.yml
Simple merge
Mirror of https://git.torproject.org/tor.git