aboutsummaryrefslogtreecommitdiff
path: root/changes/bug12996
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-06-27 11:04:44 -0400
committerNick Mathewson <nickm@torproject.org>2017-06-27 11:04:44 -0400
commitccae991662adb3b64bdb1dcd4a942e4d1e163414 (patch)
tree16d34adaf88e311fca522b65b16eb6ad76c749f4 /changes/bug12996
parent325c507a090589ada4f0a781a313214c7cfd33a0 (diff)
parentd56f6993990ab75b6ab8a80027ee60e610489a2c (diff)
downloadtor-ccae991662adb3b64bdb1dcd4a942e4d1e163414.tar.gz
tor-ccae991662adb3b64bdb1dcd4a942e4d1e163414.zip
Merge branch 'maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'changes/bug12996')
0 files changed, 0 insertions, 0 deletions