commit 84cdcc68a944b31a0b138fcf5ac5e9074c27ed5a Merge: 4f730e4 7605985 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 22 15:57:36 2011 -0500
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Use "ours" strategy" to avoid taking bug2402 fix.
tor-commits@lists.torproject.org