]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d891e2a b79e90f)
Merge branch 'ticket16901'
authorNick Mathewson <nickm@torproject.org>
Tue, 1 Sep 2015 14:42:47 +0000 (10:42 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 1 Sep 2015 14:42:47 +0000 (10:42 -0400)

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