]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'ioerror/DisableDebuggerAttachment'
authorNick Mathewson <nickm@torproject.org>
Fri, 25 Nov 2011 04:38:32 +0000 (23:38 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 25 Nov 2011 04:38:32 +0000 (23:38 -0500)
commit68114ca52cbed0b7970a60717be4ca22ffdc5d00
tree23d882336da9b8736ea432843e383aef654019f8
parentf634228a073965195c4088b66c1d5c4799c6eed2
parentf79a75f59731eab85c019c41827c0c0e89d90498
Merge remote-tracking branch 'ioerror/DisableDebuggerAttachment'

Conflicts:
src/or/config.c
doc/tor.1.txt
src/or/config.c
src/or/or.h