| commit | 84cdcc68a944b31a0b138fcf5ac5e9074c27ed5a | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Tue, 22 Feb 2011 20:57:36 +0000 (22 15:57 -0500) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Tue, 22 Feb 2011 20:57:55 +0000 (22 15:57 -0500) | ||
| tree | bd5fa811b1bcc19e0794f5ba0092caf1b26b14c0 | treesnapshot (tar.gz zip) |
| parent | 4f730e4f3f39748e214470357e3d7aff407fe7e0 | commitdiff |
| parent | 7605985b3ff71cee7fabdf023baf298b218d04c1 | commitdiff |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Use "ours" strategy" to avoid taking bug2402 fix.
Use "ours" strategy" to avoid taking bug2402 fix.