]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7616922 bc2bed8)
Merge remote-tracking branch 'teor/bug17888'
authorNick Mathewson <nickm@torproject.org>
Tue, 12 Jan 2016 17:26:06 +0000 (12:26 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 12 Jan 2016 17:26:06 +0000 (12:26 -0500)
1  2 
scripts/maint/updateFallbackDirs.py patch | diff1 | diff2 | blob | history

diff --cc scripts/maint/updateFallbackDirs.py
Simple merge
Mirror of https://git.torproject.org/tor.git