Robert Ransom
a364f88477
Add ifdefs to disable #3332 assertions
2011-11-30 14:54:15 -05:00
Robert Ransom
826f1d5b0a
Use single-hop intro and rend circuits when in tor2web mode
2011-11-30 14:54:15 -05:00
Robert Ransom
29287ed0ed
Perform single-hop HS desc fetches when in tor2web mode
2011-11-30 14:54:15 -05:00
Robert Ransom
ebf524b48b
Don't allow tor2web-mode Tors to connect to non-HS addresses
...
The client's anonymity when accessing a non-HS address in tor2web-mode
would be easily nuked by inserting an inline image with a .onion URL, so
don't even pretend to access non-HS addresses through Tor.
2011-11-30 14:54:15 -05:00
Robert Ransom
5f3e6eb0b9
Warn loudly on startup and SIGHUP if Tor is built for a non-anonymous mode
2011-11-30 14:54:14 -05:00
Robert Ransom
543a36a55b
Add a compile-time #define to control whether Tor runs in 'tor2web mode'
...
The Tor2webMode torrc option is still required to run a Tor client in
'tor2web mode', but now it can't be turned on at runtime in a normal build
of Tor. (And a tor2web build of Tor can't be used as a normal Tor client,
so we don't have to worry as much about someone distributing packages with
this particular pistol accessible to normal users.)
2011-11-30 14:54:14 -05:00
Robert Ransom
b2212bf9b4
Add Tor2webMode configuration option
2011-11-24 03:54:32 -08:00
Sebastian Hahn
11221d0f17
Update check-spaces to remove false positive for timercmp macro
...
The timercmp macro uses triggers a "space between function name and
opening parentheses" warning for the check spaces script. Work around
this by simply disabling the check for all "functions" named 'op()'.
2011-11-24 09:29:45 +01:00
Sebastian Hahn
f77f9bddb8
appease check-spaces
2011-11-24 09:20:51 +01:00
Sebastian Hahn
46d69cb915
Fix compile warning in tor_inet_pton() (on 64bit)
...
This slipped through into 0.2.3.8-alpha unfortunately.
2011-11-24 09:19:57 +01:00
Nick Mathewson
f067067ee6
Merge branch 'bug2474'
...
Had to resolve conflicts wrt the " (using bufferevents)" addition to the
startup string.
Conflicts:
src/or/main.c
2011-11-23 17:14:54 -05:00
Nick Mathewson
2b4d4ffa8f
Tweak the "this is not a stable release" warning some more
2011-11-23 17:09:36 -05:00
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
which accidentally
only made it into master. Fixes bug 4547. Bug isn't in any released
version.
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
(where it used to be 100KB).
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
that
accidentally only went into master
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
which
accidentally only went into master
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
6a6233b70b
Fix a couple of memory leaks in rend_add_service spotted by coverity
2011-11-17 17:14:49 -05:00