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
Roger Dingledine
b7b2041dbf
and rm the old ones
2011-11-21 19:34:30 -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
6a76007b08
Merge branch 'maint-0.2.2'
...
Conflicts:
src/or/dirserv.c
2011-11-21 18:36:49 -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
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
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
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
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
2408934516
Merge remote-tracking branch 'sebastian/bug2893'
2011-11-16 17:30: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
Roger Dingledine
67650a869d
allow manual control port authenticate via netcat
2011-11-16 18:14:03 +01:00
Sebastian Hahn
9fc7725aba
Don't allow building on platforms where AF_UNSPEC != 0
2011-11-16 16:39:04 +01:00
Nick Mathewson
87622e4c7e
Allow up to a 30 days future skew, 48 hours past skew in certs.
2011-11-15 15:57:41 -05:00
Nick Mathewson
26fcb4bb8c
Merge remote-tracking branch 'sebastian/bug4469'
2011-11-15 11:59:37 -05:00
Nick Mathewson
3ef40f6993
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-15 11:42:38 -05:00
Sebastian Hahn
4b8d2ad6f5
Fix compile warnings on windows
2011-11-15 13:34:04 +01:00
Nick Mathewson
5bea660f8e
Use real_addr in send_netinfo
...
Reported by "troll_un"; bugfix on 0.2.0.10-alpha; fixes bug 4349.
2011-11-14 22:43:40 -05:00
Nick Mathewson
4af82fb388
Merge remote-tracking branch 'public/bug4367'
2011-11-14 22:35:49 -05:00
Nick Mathewson
7be50c26e8
Disable IOCP and retry event_base_new_with_config once on failure
...
This is a fancier bug4457 workaround for 0.2.3. In 0.2.2, we could
just tell Libevent "Don't enable locking!" so it wouldn't try to make
the event_base notifiable. But for IOCP, we need a notifiable base.
(Eventually, we'll want a notifiable base for other stuff, like
multithreaded crypto.) So the solution is to try a full-featured
initialization, and then retry with all the options turned off if that
fails.
2011-11-14 18:12:29 -05:00
Nick Mathewson
cf8117136c
Merge remote-tracking branch 'public/bug4457_022' into bug4457_master
...
Conflicts:
src/common/compat_libevent.c
Resolving conflict by not taking 7363eae13c
2011-11-14 17:59:42 -05:00
Nick Mathewson
0f6c021617
Detect failure from event_init() or event_base_new_with_config()
2011-11-14 17:53:45 -05:00
Nick Mathewson
7363eae13c
Use the EVENT_BASE_FLAG_NOLOCK flag to prevent socketpair() invocation
...
In Tor 0.2.2, we never need the event base to be notifiable, since we
don't call it from other threads. This is a workaround for bug 4457,
which is not actually a Tor bug IMO.
2011-11-14 17:48:57 -05:00
Nick Mathewson
9292a78722
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-14 11:10:45 -05:00
Nick Mathewson
2b7bdc295a
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-11-14 11:10:27 -05:00
Nick Mathewson
13f02c387f
Merge remote-tracking branch 'karsten/geoip-november2011' into maint-0.2.1
2011-11-14 11:10:10 -05:00
Gisle Vanem
af12a7ac00
Fix test_util.c compilation on MSVC
...
"Those '{}' constructs are not well liked by MSVC (cl v.16.xx)."
Received on tor-dev; fixes bug on 0.2.3.3-alpha.
2011-11-11 23:49:53 -05:00
Nick Mathewson
ff93535c71
New src/test/bench.c to allow us to actually _run_ benchmark code
...
Yes, the timing functions are suboptimal. Please improve!
2011-11-11 12:35:08 -05:00
Sebastian Hahn
38123ffa23
Fix the bench_{aes,dmap} test functions to work with TT
...
TT expects them to be named test_bench_{aes,dmap}. Also change the
DISABLED macro to reflect that.
2011-11-11 11:47:25 -05:00
Nick Mathewson
21cf7079fe
Dump our internal AES implementation
...
This thing was pretty pointless on versions of OpenSSL 0.9.8 and later,
and almost totally pointless on OpenSSL 1.0.0.
Also, favor EVP by default, since it lets us get hardware acceleration
where present. (See issue 4442)
2011-11-11 11:47:24 -05:00
Nick Mathewson
613ff5698a
Changes file for patches from 4ZM
2011-11-11 11:11:15 -05:00
Nick Mathewson
e1c6431e42
Correct the handling of overflow behavior in smartlist_ensure_capacity
...
The old behavior was susceptible to the compiler optimizing out our
assertion check, *and* could still overflow size_t on 32-bit systems
even when it did work.
2011-11-09 14:48:52 -05:00
Nick Mathewson
f0589da0e3
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-09 11:04:40 -05:00
Nick Mathewson
8adec87050
Merge remote-tracking branch 'rransom-tor/bug4426' into maint-0.2.2
2011-11-09 11:03:20 -05:00
Nick Mathewson
9452b65680
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-09 10:28:43 -05:00
Sebastian Hahn
0cc7a63fc0
Don't warn when compiling with --disable-threads
...
STMT_VOID semantics suggested by nick, thanks!
2011-11-09 10:26:35 +01:00
Robert Ransom
565463243c
Include HiddenServiceDir in some warning messages
2011-11-07 17:02:50 -08:00
