aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-11-15 08:06:36 -0500
committerNick Mathewson <nickm@torproject.org>2019-11-15 08:06:36 -0500
commit00cdb17a5427c22b5abc7362ca8b0b5daaf7a09c (patch)
tree736def96fe63113f776b52a028551392b49d093d /ChangeLog
parent825f52784d875ee580fe82619302a21c958d77ea (diff)
parent6d81ca845c0f99335f9620a537ebc86219b7e0c9 (diff)
downloadtor-00cdb17a5427c22b5abc7362ca8b0b5daaf7a09c.tar.gz
tor-00cdb17a5427c22b5abc7362ca8b0b5daaf7a09c.zip
Merge branch 'maint-0.4.2'
"ours" to avoid version bump.
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions