]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e4ef9f7 0ec9458)
Merge remote-tracking branch 'teor/bug20613' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Thu, 10 Nov 2016 14:10:55 +0000 (09:10 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 10 Nov 2016 14:10:55 +0000 (09:10 -0500)

Trivial merge
Mirror of https://git.torproject.org/tor.git