aboutsummaryrefslogtreecommitdiff
path: root/changes/bug1345
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-11-24 23:38:32 -0500
committerNick Mathewson <nickm@torproject.org>2011-11-24 23:38:32 -0500
commit68114ca52cbed0b7970a60717be4ca22ffdc5d00 (patch)
tree23d882336da9b8736ea432843e383aef654019f8 /changes/bug1345
parentf634228a073965195c4088b66c1d5c4799c6eed2 (diff)
parentf79a75f59731eab85c019c41827c0c0e89d90498 (diff)
downloadtor-68114ca52cbed0b7970a60717be4ca22ffdc5d00.tar
tor-68114ca52cbed0b7970a60717be4ca22ffdc5d00.tar.gz
Merge remote-tracking branch 'ioerror/DisableDebuggerAttachment'
Conflicts: src/or/config.c
Diffstat (limited to 'changes/bug1345')
0 files changed, 0 insertions, 0 deletions