]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7ec170 04f7944)
Merge remote-tracking branch 'teor/bug20667'
authorNick Mathewson <nickm@torproject.org>
Fri, 2 Dec 2016 17:07:10 +0000 (12:07 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 2 Dec 2016 17:07:10 +0000 (12:07 -0500)

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