]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 383238b 550c033)
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Fri, 12 Sep 2014 01:41:56 +0000 (21:41 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 12 Sep 2014 01:41:56 +0000 (21:41 -0400)
(Do an "ours" merge to avoid taking version number changes)


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