[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.3'
nickm at torproject.org
nickm at torproject.org
Wed Sep 12 19:39:00 UTC 2012
commit 79b31dd4f8b45d9c68fa33dcd564deb60a26286e
Merge: 35e19b9 45439bf
Author: Nick Mathewson <nickm at torproject.org>
Date: Wed Sep 12 15:38:33 2012 -0400
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.
More information about the tor-commits
mailing list