diff options
author | Nick Mathewson <nickm@torproject.org> | 2010-09-28 14:42:52 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2010-09-28 14:42:52 -0400 |
commit | 3efaa30727f23f316941b6ac861a7027f8204769 (patch) | |
tree | d671760bb22f7010a2c2695f0a2891fc7393a9c2 /changes | |
parent | c58b7a109559a609f642d1fb7eb2e55b0d566ba5 (diff) | |
parent | 73d93c033d3f4b9c95e8f3a5cc7e4a255d523b84 (diff) | |
download | tor-3efaa30727f23f316941b6ac861a7027f8204769.tar tor-3efaa30727f23f316941b6ac861a7027f8204769.tar.gz |
Merge branch 'iocp_option'
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bufferevent-support | 3 | ||||
-rw-r--r-- | changes/cpudetect | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/bufferevent-support b/changes/bufferevent-support index 22ee50ebf..e39c36f13 100644 --- a/changes/bufferevent-support +++ b/changes/bufferevent-support @@ -6,4 +6,7 @@ flag. Using this feature will make our networking code more flexible, lets us stack layers on each other, and let us use more efficient zero-copy transports where available. + - As an experimental feature, when using the "bufferevents" buffered + IO backend, Tor can try to use Windows's IOCP networking API. This + is off by default. To turn it on, add "DisableIOCP 0" to your torrc. diff --git a/changes/cpudetect b/changes/cpudetect new file mode 100644 index 000000000..eeaa492f5 --- /dev/null +++ b/changes/cpudetect @@ -0,0 +1,3 @@ + o Minor features + - If you set the NumCPUs option to 0, Tor will try to detect how many + CPUs you have. This is the new default behavior. |