| commit | a7528bbf48515d8fcd3ef1d5a3d2bebae36a8e35 | |
| author | Roger Dingledine <arma@torproject.org> | |
| Mon, 24 Jan 2011 23:14:19 +0000 (24 18:14 -0500) | ||
| committer | Roger Dingledine <arma@torproject.org> | |
| Mon, 24 Jan 2011 23:14:19 +0000 (24 18:14 -0500) | ||
| tree | 647aa67addacc5ecded73ece43ece58c03f8a1ac | treesnapshot (tar.gz zip) |
| parent | d082e2888db13dfc53b0340cffa2375a0879f56b | commitdiff |
| parent | 5ed73e3807d90dd0a3a2e5542f98a0a58374a066 | commitdiff |
Merge branch 'maint-0.2.2' into release-0.2.2