| commit | 5ddb9b3134b30da0c4ae8857bc15ddaa7c29a4b1 | |
| author | Roger Dingledine <arma@torproject.org> | |
| Fri, 6 Jul 2012 20:31:40 +0000 (6 16:31 -0400) | ||
| committer | Roger Dingledine <arma@torproject.org> | |
| Fri, 6 Jul 2012 20:31:40 +0000 (6 16:31 -0400) | ||
| tree | 53d63a1e63d835096382e61341ded1067c6fbf0e | treesnapshot (tar.gz zip) |
| parent | 27ec0248d2460cdfc52462d313272c206ab46f02 | commitdiff |
| parent | 4e7552e5528e9e7f2f8ddaee81fe2da9606091b2 | commitdiff |
Merge branch 'maint-0.2.2' into maint-0.2.3