Nick Mathewson
3890c81e7c
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-23 16:28:18 -05:00
Nick Mathewson
fbf1c5ee79
Merge remote-tracking branch 'public/bug4230' into maint-0.2.2
2011-11-23 16:22:26 -05:00
Nick Mathewson
281aa2e237
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-23 12:12:52 -05:00
Sebastian Hahn
841247a586
Fix a compile warning on 64bit OS X
...
Backport of 68475fc5c5
2011-11-23 12:06:55 -05:00
Roger Dingledine
e18fa28248
sebastian is the new karsten, i hear
2011-11-23 04:41:46 -05:00
Roger Dingledine
dfe6dac37c
bump to 0.2.3.8-alpha-dev
2011-11-23 04:41:19 -05:00
Sebastian Hahn
68475fc5c5
Fix a compile warning on 64bit OS X
2011-11-23 01:41:37 +01:00
Roger Dingledine
a58d9e6045
bump to 0.2.3.8-alpha
2011-11-22 18:29:57 -05:00
Roger Dingledine
947c3de520
add a blurb for 0.2.3.8-alpha
2011-11-22 18:29:34 -05:00
Roger Dingledine
b7b2041dbf
and rm the old ones
2011-11-21 19:34:30 -05:00
Roger Dingledine
03c416a3d7
fold in more changes files
2011-11-21 19:34:12 -05:00
Roger Dingledine
023d8b6cf8
update the man page for the new AuthDirFastGuarantee value
2011-11-21 18:45:44 -05:00
Roger Dingledine
fce107b11e
raise AuthDirFastGuarantee from 20KB to 100KB
...
This patch reverts part of 39ceda7e05
2011-11-21 18:44:59 -05:00
Roger Dingledine
58764d8ec6
apparently or_options_t likes being a const in master
2011-11-21 18:42:07 -05:00
Roger Dingledine
6a76007b08
Merge branch 'maint-0.2.2'
...
Conflicts:
src/or/dirserv.c
2011-11-21 18:36:49 -05:00
Roger Dingledine
97a209ea28
man page entries for AuthDir{Fast,GuardBW}Guarantee
2011-11-21 18:32:32 -05:00
Roger Dingledine
c0ec4eafc5
parameterize bw cutoffs to guarantee Fast and Guard flags
...
Now it will be easier for researchers to simulate Tor networks with
different values. Resolves ticket 4484.
2011-11-21 18:22:10 -05:00
Roger Dingledine
c9f24edb13
fold in more changes entries
2011-11-21 18:04:01 -05:00
Nick Mathewson
f4e053d6df
Merge branch 'bug4518' into maint-0.2.2
2011-11-21 17:25:51 -05:00
Roger Dingledine
5d8597ee71
further cleanups
2011-11-21 16:33:18 -05:00
Roger Dingledine
f3452b58ba
fold in more changes entries
2011-11-21 16:33:18 -05:00
Nick Mathewson
929074b368
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-21 10:52:38 -05:00
Nick Mathewson
b3c988f0d7
Merge remote-tracking branch 'public/bug3963' into maint-0.2.2
2011-11-21 10:52:15 -05:00
Nick Mathewson
0539c34c35
Merge branch 'bug4360'
2011-11-21 10:48:02 -05:00
Nick Mathewson
a6eef61f02
Changes file for bug4360
2011-11-21 10:47:57 -05:00
Nick Mathewson
3e9c86a8f9
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-20 20:16:49 -05:00
Nick Mathewson
fbcd7c01e7
Changes file for bug4521 backports.
2011-11-20 20:15:13 -05:00
Sebastian Hahn
2efa6eb652
Sockets are unsigned on windows
...
this gets rid of a warning about signed/unsigned comparison
This is a backport of 0a5338e03c
2011-11-20 15:15:14 +01:00
Nick Mathewson
7992eb43c5
Log more loudly on a bad cert from an authority.
...
Clock skew made this situation way too frequent so we demoted it to
"protocol_warn", but when there's an authority, it should really just
be warn.
2011-11-20 00:48:25 -05:00
Sebastian Hahn
3dc2a1c62c
Get rid of an unused parameter warning on win
...
This is a backport of bed79c47f4
2011-11-20 03:02:28 +01:00
Nick Mathewson
f2f156f0e8
changes file for bug4515
2011-11-19 18:46:15 -05:00
Nick Mathewson
8e388bc39c
Only call cull_wedged_cpuworkers once every 60 seconds.
...
The function is over 10 or 20% on some of Moritz's profiles, depending
on how you could.
Since it's checking for a multi-hour timeout, this is safe to do.
Fixes bug 4518.
2011-11-19 18:30:55 -05:00
Anders Sundman
725d4f035c
Imporved unit test coverage for tor_inet_pton
2011-11-19 10:58:33 +01:00
Anders Sundman
edc561432a
Minor tor_inet_pton bug fixes
...
In particular:
* Disallow "0x10::"
* Don't blow up on ":"
* Disallow "::10000"
2011-11-19 10:58:33 +01:00
Nick Mathewson
53dac6df18
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-18 19:09:08 -05:00
Sebastian Hahn
6ef44b7849
Don't log about stats when running as a client without geoip
...
Completely disable stats if we aren't running as a relay. We won't
collect any anyway, so setting up the infrastructure for them and
logging about them is wrong. This also removes a confusing log
message that clients without a geoip db would have seen.
Fixes bug 4353.
2011-11-19 00:50:03 +01:00
Nick Mathewson
b88db7573c
Merge remote-tracking branch 'public/benchmark'
2011-11-18 18:42:49 -05:00
Nick Mathewson
6e6a661296
New UserspaceIOCPBuffers option to set SO_{SND,RCV}BUF to zero
...
When running with IOCP, we are in theory able to use userspace-
allocated buffers to avoid filling up the stingy amount of kernel
space allocated for sockets buffers.
The bufferevent_async implementation in Libevent provides this
ability, in theory. (There are likely to be remaining bugs). This
patch adds a new option that, when using IOCP bufferevents, sets
each socket's send and receive buffers to 0, so that we should use
this ability.
When all the bugs are worked out here, if we are right about bug 98,
this might solve or mitigate bug 98.
This option is experimental and will likely require lots of testing
and debugging.
2011-11-18 17:43:03 -05:00
Nick Mathewson
6a6233b70b
Fix a couple of memory leaks in rend_add_service spotted by coverity
2011-11-17 17:14:49 -05:00
Roger Dingledine
95163ec072
trivial code cleanup in generate_v2_networkstatus_opinion()
2011-11-16 18:59:20 -05:00
Roger Dingledine
3992c5487f
fix trivial typo
...
somebody should s/authoritative directory server/directory authority/g
at some point
2011-11-16 18:10:13 -05:00
Nick Mathewson
2408934516
Merge remote-tracking branch 'sebastian/bug2893'
2011-11-16 17:30:24 -05:00
Nick Mathewson
07a5fd1054
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-16 16:23:24 -05:00
Nick Mathewson
2f3dad10a8
Merge branch 'bug4457_master'
2011-11-16 16:23:15 -05:00
Nick Mathewson
5a02406ae0
Merge branch 'bug4457_022' into maint-0.2.2
2011-11-16 16:22:47 -05:00
Sebastian Hahn
7bd46344df
Eat all whitespace after a control command
2011-11-16 18:14:06 +01:00
Roger Dingledine
67650a869d
allow manual control port authenticate via netcat
2011-11-16 18:14:03 +01:00
Sebastian Hahn
8200a85323
Fix a check-spaces complaint
2011-11-16 16:40:56 +01:00
Sebastian Hahn
9fc7725aba
Don't allow building on platforms where AF_UNSPEC != 0
2011-11-16 16:39:04 +01:00
Sebastian Hahn
688b53059e
Don't fail to send netinfo if real_addr is unset
...
If we haven't set real_addr on a connection, we also now that _base.addr
hasn't been tampered with. So we can use that.
2011-11-16 16:05:46 +01:00
