diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-22 15:57:36 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-22 15:57:55 -0500 |
| commit | 84cdcc68a944b31a0b138fcf5ac5e9074c27ed5a (patch) | |
| tree | bd5fa811b1bcc19e0794f5ba0092caf1b26b14c0 /doc/TODO.external | |
| parent | 4f730e4f3f39748e214470357e3d7aff407fe7e0 (diff) | |
| parent | 7605985b3ff71cee7fabdf023baf298b218d04c1 (diff) | |
| download | tor-84cdcc68a944b31a0b138fcf5ac5e9074c27ed5a.tar tor-84cdcc68a944b31a0b138fcf5ac5e9074c27ed5a.tar.gz | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Use "ours" strategy" to avoid taking bug2402 fix.
Diffstat (limited to 'doc/TODO.external')
0 files changed, 0 insertions, 0 deletions