summaryrefslogtreecommitdiff
path: root/changes/bug12160
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-11-24 09:19:06 -0500
committerNick Mathewson <nickm@torproject.org>2014-11-24 09:19:06 -0500
commit5b55778c86b88329725521d2c93829a9c9ad3501 (patch)
tree99ceb6908c5d241e64fac071c13588a7cbdf5dcc /changes/bug12160
parent0872d8e3cf3281fc5831375252db9e39de12e927 (diff)
parent137982f955b297b41a89086d672baf761825c152 (diff)
downloadtor-5b55778c86b88329725521d2c93829a9c9ad3501.tar.gz
tor-5b55778c86b88329725521d2c93829a9c9ad3501.zip
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Diffstat (limited to 'changes/bug12160')
0 files changed, 0 insertions, 0 deletions