| commit | 9959bc54e1210644af83ef5dde6c66e2641661ed | |
| author | Roger Dingledine <arma@torproject.org> | |
| Sat, 17 May 2014 08:36:17 +0000 (17 04:36 -0400) | ||
| committer | Roger Dingledine <arma@torproject.org> | |
| Sat, 17 May 2014 08:36:17 +0000 (17 04:36 -0400) | ||
| tree | 55dcdeefc1a2ece88bedc421f449dbe868e27329 | treesnapshot (tar.gz zip) |
| parent | 2ee56e4c2c841a45418cfb826e1ce6689278382d | commitdiff |
| parent | 8d9602c21ccc0d93c82c651d94791df88cf4c9ad | commitdiff |
Merge branch 'maint-0.2.4' into release-0.2.4
This is an "ours" merge, to avoid taking the commit that bumped
maint-0.2.4's version to 0.2.4.22-dev.
This is an "ours" merge, to avoid taking the commit that bumped
maint-0.2.4's version to 0.2.4.22-dev.