commit 79b31dd4f8b45d9c68fa33dcd564deb60a26286e Merge: 35e19b9 45439bf Author: Nick Mathewson <[email protected]> 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.
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
