| commit | 06deec15c9ecb7c40e3f7f8e05be887ab0705877 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Tue, 22 Feb 2011 22:20:55 +0000 (22 17:20 -0500) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Tue, 22 Feb 2011 22:20:59 +0000 (22 17:20 -0500) | ||
| tree | a91aeb924e6894cba42c159ae9d8f2ee7f9db315 | treesnapshot (tar.gz zip) |
| parent | e606f19fa369c7ad5934793cb4f72f97972b52bc | commitdiff |
| parent | 491abbc65e535b5308d6c57ab9ab3900ac2dd2d2 | commitdiff |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
(This is an "ours" merge of the code for bug1859 backported to 0.2.1.)
(This is an "ours" merge of the code for bug1859 backported to 0.2.1.)