diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-10-17 14:57:44 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-10-17 14:57:44 -0400 |
commit | 3b6f924e507d15fc7290649738048db9c79ec70d (patch) | |
tree | 48abf7e58221b17a422f5ca316830ca19cd89523 /ChangeLog | |
parent | 52b2b2c82f304629eb1128ed46fdd6edeba7eb67 (diff) | |
parent | 0fa3811c787ed4d80f395bbf464271d3cbb2852e (diff) | |
download | tor-3b6f924e507d15fc7290649738048db9c79ec70d.tar.gz tor-3b6f924e507d15fc7290649738048db9c79ec70d.zip |
Merge branch 'maint-0.2.8'
("ours" merge to avoid taking version bump)
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions