summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-12-07 21:12:20 -0500
committerNick Mathewson <nickm@torproject.org>2011-12-07 21:12:20 -0500
commit8bb853b2a23e56505d598ee9c38ce56b4afe248c (patch)
tree929849a8ce86601cc4efe7e129472b99aedc0f7d /ChangeLog
parent299034edf5e05c81d535fc7d0b2120b6a2810477 (diff)
parent0ebcf345ce6087deeb9f1a1a54b9e6d003822fc3 (diff)
downloadtor-8bb853b2a23e56505d598ee9c38ce56b4afe248c.tar.gz
tor-8bb853b2a23e56505d598ee9c38ce56b4afe248c.zip
Merge remote-tracking branch 'public/revert_4312'
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions