]> git.ipfire.org Git - thirdparty/tor.git/commit
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)
commit79b31dd4f8b45d9c68fa33dcd564deb60a26286e
treec35c24f1e772b2727c1f5b1744fc5e47823f41e2
parent35e19b9498e3d23d87d7adacd4ec27969d63d315
parent45439bfced7f41c2e0beecb715880cb83d421618
Merge remote-tracking branch 'origin/maint-0.2.3'

Use the "ours" strategy so that we retain 4aff97cfc796, which maint-0.2.3
just reverted.