]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 831649f b9a43c8)
Merge remote-tracking branch 'public/bug20063'
authorNick Mathewson <nickm@torproject.org>
Tue, 13 Sep 2016 15:25:59 +0000 (11:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 13 Sep 2016 15:25:59 +0000 (11:25 -0400)

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