diff options
| author | Roger Dingledine <arma@torproject.org> | 2014-05-17 04:36:17 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2014-05-17 04:36:17 -0400 |
| commit | 9959bc54e1210644af83ef5dde6c66e2641661ed (patch) | |
| tree | 55dcdeefc1a2ece88bedc421f449dbe868e27329 | |
| parent | 2ee56e4c2c841a45418cfb826e1ce6689278382d (diff) | |
| parent | 8d9602c21ccc0d93c82c651d94791df88cf4c9ad (diff) | |
| download | tor-9959bc54e1210644af83ef5dde6c66e2641661ed.tar.gz tor-9959bc54e1210644af83ef5dde6c66e2641661ed.zip | |
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.
0 files changed, 0 insertions, 0 deletions