]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35e19b9 45439bf)
Merge remote-tracking branch 'origin/maint-0.2.3'
authorNick Mathewson <nickm@torproject.org>
Wed, 12 Sep 2012 19:38:33 +0000 (15:38 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 12 Sep 2012 19:38:33 +0000 (15:38 -0400)
Use the "ours" strategy so that we retain 4aff97cfc796, which maint-0.2.3
just reverted.


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