]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 98da122 a659a3f)
Merge remote-tracking branch 'teor/bug16069-bug17027'
authorNick Mathewson <nickm@torproject.org>
Wed, 16 Sep 2015 12:20:15 +0000 (08:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 16 Sep 2015 12:20:15 +0000 (08:20 -0400)

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