| commit | 2998d384ec23677693b5894118d92efd0208dd5b | |
| author | Roger Dingledine <arma@torproject.org> | |
| Mon, 21 Jul 2014 18:39:48 +0000 (21 14:39 -0400) | ||
| committer | Roger Dingledine <arma@torproject.org> | |
| Mon, 21 Jul 2014 18:39:48 +0000 (21 14:39 -0400) | ||
| tree | 7d32bffb46299e254be33aa51958c8e455d35c35 | treesnapshot (tar.gz zip) |
| parent | 9959bc54e1210644af83ef5dde6c66e2641661ed | commitdiff |
| parent | 75501dbe4a70914ec8f19689849d3539d87be271 | commitdiff |
Merge branch 'maint-0.2.4' into release-0.2.4