summaryrefslogtreecommitdiff
path: root/changes/ticket32806
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2020-01-20 15:50:54 +1000
committerteor <teor@torproject.org>2020-01-20 15:50:54 +1000
commit3851128e886906aee5afa790c96f5b7dc2940454 (patch)
tree0fc9b24b041702c4f50ef4c0ebb688d3d22ccdbd /changes/ticket32806
parent4f88eb849c8f85c7cd70fc20250270401e986efd (diff)
parent4541289f2a7e7a79da8cea38a94af5afd9ac9f72 (diff)
downloadtor-3851128e886906aee5afa790c96f5b7dc2940454.tar.gz
tor-3851128e886906aee5afa790c96f5b7dc2940454.zip
Merge branch 'ticket20218_rebased_squashed' into ticket20218_merged
* ticket 32695 removed networkstatus_consensus_has_ipv6(), keep that change in master. * ticket 20218 modifies the function name and comment for routerstatus_has_visibly_changed(), keep that change in ticket20218_rebased_squashed.
Diffstat (limited to 'changes/ticket32806')
0 files changed, 0 insertions, 0 deletions