Sebastian Hahn
68475fc5c5
Fix a compile warning on 64bit OS X
2011-11-23 01:41:37 +01: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
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
Nick Mathewson
f4e053d6df
Merge branch 'bug4518' into maint-0.2.2
2011-11-21 17:25:51 -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
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
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
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
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
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
Nick Mathewson
69dd993a92
Make certificate skew into a protocol warning
2011-11-15 15:57:46 -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
ce51887291
All-in-one benchmark test for cell crypto
2011-11-11 13:06:17 -05:00
Nick Mathewson
f0589da0e3
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-09 11:04:40 -05:00
Nick Mathewson
d4489a2851
Rewrite comment at head of eventdns.c
...
Let's make it more obvious to the everyday reader that eventdns.c is
a) Based on Libevent's evdns.c
b) Slated for demolition
c) Supposed to keep API-compatibility with Libevent.
d) Not worth tweaking unless there's a bug.
2011-11-09 00:23:44 -05:00
Robert Ransom
565463243c
Include HiddenServiceDir in some warning messages
2011-11-07 17:02:50 -08:00
Robert Ransom
bfb900e426
Add some XXXes
2011-11-07 15:32:43 -08:00
Robert Ransom
ef2b0bd528
Add GETINFO md/id/* and md/name/* items for relay microdescs
2011-11-07 15:32:33 -08:00
Nick Mathewson
4a7225d4c9
Merge remote-tracking branch 'rransom-tor/bug4411'
2011-11-07 11:57:07 -05:00
Robert Ransom
749b37bcf4
Fix assert on clients of and authorities for v0 HS descs
2011-11-07 08:48:23 -08:00
Nick Mathewson
ceebc8283f
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-07 11:48:02 -05:00
Nick Mathewson
ca282e5326
Merge branch 'bug4424' into maint-0.2.2
2011-11-07 11:47:28 -05:00
Nick Mathewson
02d89c5c66
Remove an extraneous "if" in the 4424 fix
2011-11-07 11:46:51 -05:00
Robert Ransom
65a0d7e7ef
Don't leak an extend_info_t in rend_client_any_intro_points_usable
2011-11-07 08:35:51 -08:00
Nick Mathewson
51f53b590e
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-07 10:44:02 -05:00
Nick Mathewson
4d8306e0e9
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-11-07 10:42:34 -05:00
Dan Rosenberg
d5161ab895
Fix remotely triggerable assert during ip decryption
...
Fixes bug 4410.
2011-11-06 17:23:14 +01:00
Nick Mathewson
c1005dd6d3
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-11-03 13:24:46 -04:00
George Kadianakis
3ae96845d3
Fix a memleak when fetching descriptors for bridges in ExcludeNodes.
2011-11-03 13:23:50 -04:00
Nick Mathewson
325a659cb1
Even when we can't answer an AUTH_CHALLENGE, send NETINFO.
...
Fixes bug 4368; fix on 0.2.3.6-alpha; bug found by "frosty".
2011-11-03 12:40:02 -04:00
Nick Mathewson
88c4b425bd
Fix bug 4367: correctly detect auth_challenge cells we can't use
...
Found by frosty_un, bugfix on 0.2.3.6-alpha, fix suggested by arma.
2011-11-03 11:52:35 -04:00
Andrea Gelmini
72d4d762c1
Remove some duplicate includes
2011-11-03 10:23:33 -04:00
Sebastian Hahn
eb30999972
Fix a check-spaces complaint
2011-11-02 20:57:58 +01:00
Sebastian Hahn
c98faa1a23
Resolve a crash when running as dirauth
...
When we're asked for our own descriptor, don't crash.
2011-11-02 20:57:23 +01:00
Roger Dingledine
be1f3a5eb5
normalize the name of the CERTS cell
2011-10-31 04:33:38 -04:00
