]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'teor/bug17887-v2'
authorNick Mathewson <nickm@torproject.org>
Tue, 12 Jan 2016 15:47:54 +0000 (10:47 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 12 Jan 2016 15:47:54 +0000 (10:47 -0500)
1  2 
scripts/maint/updateFallbackDirs.py

Simple merge