]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: feb41b7 36c3235)
Merge branch 'maint-0.3.4' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Tue, 27 Nov 2018 17:03:50 +0000 (12:03 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 27 Nov 2018 17:03:50 +0000 (12:03 -0500)
1  2 
.appveyor.yml patch | diff1 | diff2 | blob | history

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