]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f273295 5cde98e)
Merge remote-tracking branch 'teor/master'
authorNick Mathewson <nickm@torproject.org>
Wed, 2 Sep 2015 13:15:16 +0000 (09:15 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 2 Sep 2015 13:15:16 +0000 (09:15 -0400)

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