]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e103509 ec1bc8a)
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Mon, 26 Mar 2012 17:57:51 +0000 (13:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 26 Mar 2012 17:57:51 +0000 (13:57 -0400)
Conflicts:
changes/bug5090

bug5090 was already merged and corrected in the master branch's changelog.


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