]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d598d83 27b9170)
Merge branch 'maint-0.3.4' into maint-0.3.5
authorNick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2018 14:06:18 +0000 (09:06 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 15 Nov 2018 14:06:18 +0000 (09:06 -0500)
1  2 
.appveyor.yml patch | diff1 | diff2 | blob | history

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