diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-05-16 09:17:34 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-05-16 09:17:34 -0400 |
| commit | ef9c00f53962713e1f7866004f3b83a136cfcedc (patch) | |
| tree | 821ce45b739d36d900146cdf38e3e54dc48a09bc | |
| parent | 34552740b18b14d60ce5f6b67c77be13ca94bf14 (diff) | |
| parent | 8d9602c21ccc0d93c82c651d94791df88cf4c9ad (diff) | |
| download | tor-ef9c00f53962713e1f7866004f3b83a136cfcedc.tar.gz tor-ef9c00f53962713e1f7866004f3b83a136cfcedc.zip | |
Merge remote-tracking branch 'origin/maint-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