]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c7720e 2b27ce5)
Merge branch 'bug15823_025' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Wed, 13 May 2015 15:03:05 +0000 (11:03 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 13 May 2015 15:03:05 +0000 (11:03 -0400)

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