Nick Mathewson
59f50c80d4
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
Conflicts:
src/or/or.h
src/or/relay.c
Conflicts were simple to resolve. More fixes were needed for
compilation, including: reinstating the tv_to_msec function, and renaming
*_conn_cells to *_chan_cells.
2013-11-15 15:29:24 -05:00
Nick Mathewson
9e90707602
Merge branch 'bug9093_023' into maint-0.2.3
2013-11-15 15:23:51 -05:00
Nick Mathewson
f6e07c158f
Make the dir-key-crosscert element required
...
In proposal 157, we added a cross-certification element for
directory authority certificates. We implemented it in
0.2.1.9-alpha. All Tor directory authorities now generate it.
Here, as planned, make it required, so that we can finally close
proposal 157.
The biggest change in the code is in the unit test data, where some
old hardcoded certs that we made long ago have become no longer
valid and now need to be replaced.
2013-11-14 09:37:41 -05:00
Nick Mathewson
4aa9affec2
Fix test_cmdline_args to work with old openssl
...
If openssl was old, Tor would add a warning about its version in
between saying "no torrc found, using reasonable defaults" and
"configuration was valid".
2013-11-11 15:22:08 -05:00
Nick Mathewson
ff08b9b231
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-11-11 10:50:05 -05:00
Nick Mathewson
a82b18f216
missing changes file for #10124
2013-11-11 10:49:44 -05:00
Nick Mathewson
fc5a881bd3
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-11-10 12:24:12 -05:00
Nick Mathewson
8bfa596c15
Fix two more DirServer mentions in log
2013-11-10 12:23:56 -05:00
Nick Mathewson
56ac75b265
Fix a wide line
2013-11-10 12:22:34 -05:00
Nick Mathewson
532f70a807
Change documentation DirServer->DirAuthority
...
We renamed the option, but we didn't actually fix it in the log
messages or the docs. This patch does that.
For #10124 . Patch by sqrt2.
2013-11-10 12:21:23 -05:00
Nick Mathewson
e30fb0a160
Tweak file documentation in tor.1.txt
2013-11-07 14:52:29 -05:00
rl1987
75d2ea8a99
Updating manpage to describe some of the data directory files.
2013-11-07 14:47:47 -05:00
Nick Mathewson
940d286a74
Documentation and tests for 10060
2013-11-07 14:42:58 -05:00
rl1987
86cfc64d45
Implementing --allow-missing-torrc CLI option.
2013-11-07 14:26:05 -05:00
Nick Mathewson
1b8ceb83c9
Improved circuit queue out-of-memory handler
...
Previously, when we ran low on memory, we'd close whichever circuits
had the most queued cells. Now, we close those that have the
*oldest* queued cells, on the theory that those are most responsible
for us running low on memory, and that those are the least likely to
actually drain on their own if we wait a little longer.
Based on analysis from a forthcoming paper by Jansen, Tschorsch,
Johnson, and Scheuermann. Fixes bug 9093.
2013-11-07 12:15:30 -05:00
Nick Mathewson
12dc55f487
Merge branch 'prop221_squashed_024'
...
Conflicts:
src/or/or.h
2013-11-01 10:28:01 -04:00
Nick Mathewson
5de88dda0a
circuit_build_failed: distinguish "got DESTROY" case
...
Roger spotted this on tor-dev in his comments on proposal 221.
We etect DESTROY vs everything else, since arma likes network
timeout indicating failure but not overload indicating failure.
2013-11-01 10:04:48 -04:00
Nick Mathewson
0de71bf8eb
Implement proposal 221: Stop sending CREATE_FAST
...
This makes FastFirstHopPK an AUTOBOOL; makes the default "auto"; and
makes the behavior of "auto" be "look at the consensus."
2013-11-01 10:04:48 -04:00
Nick Mathewson
dde41fa1b0
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-31 16:10:19 -04:00
Nick Mathewson
5cc155e02a
Merge remote-tracking branch 'public/bug9645' into maint-0.2.4
2013-10-31 16:09:41 -04:00
Nick Mathewson
275ab61ad4
Appease make check-spaces
2013-10-31 14:45:20 -04:00
Nick Mathewson
9bcd93a364
Merge remote-tracking branch 'public/bug10063'
2013-10-31 14:43:20 -04:00
Nick Mathewson
761ee93c69
Add missing includes for circpathbias.h
2013-10-31 14:33:34 -04:00
Nick Mathewson
8f793c38fb
Move other #9731 check to start of its functions
...
At arma's suggestion. Looks like I missed this one.
2013-10-31 14:29:18 -04:00
Nick Mathewson
5cba0ddfc4
Make circpathbias and circuitbuild compile.
...
That was the tricky part
2013-10-31 14:28:49 -04:00
Nick Mathewson
b4ebf8421a
Move pathbias functions into a new file.
...
Does not compile yet. This is the "no code changed" diff.
2013-10-31 14:17:49 -04:00
Nick Mathewson
96f92f2062
Move #9731 checks to start of their functions
...
At arma's suggestion.
2013-10-31 14:10:23 -04:00
Nick Mathewson
702c0502cf
Merge remote-tracking branch 'public/bug9731'
2013-10-31 14:09:18 -04:00
Nick Mathewson
8676a08362
Merge remote-tracking branch 'origin/maint-0.2.4'
...
Do an "ours" merge to not take the 0.2.4 fix for #9731
2013-10-31 14:08:57 -04:00
Nick Mathewson
db2c2a6909
Merge remote-tracking branch 'public/bug9731b' into maint-0.2.4
2013-10-31 14:08:28 -04:00
Nick Mathewson
61029d6926
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-31 14:03:01 -04:00
Nick Mathewson
1b312f7b55
Merge remote-tracking branch 'public/bug9780_024_v2' into maint-0.2.4
2013-10-31 14:02:28 -04:00
Nick Mathewson
a19e3e26f4
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-31 13:26:33 -04:00
Nick Mathewson
0e8ee795d9
Merge remote-tracking branch 'public/bug6055_v2_024' into maint-0.2.4
2013-10-31 13:14:39 -04:00
Nick Mathewson
4c6081910d
Only use -Wlogical-op with GCC 4.6 and later
...
It generates an apparently spurious warning with gcc 4.4 in debian;
we haven't tested 4.5.
2013-10-31 11:57:50 -04:00
Nick Mathewson
d3420e7e73
Mention that tor is client-by-default. From Weasel. Resolves #10057
2013-10-31 11:08:21 -04:00
Nick Mathewson
e02230dd85
Minor manpage tweaks from weasel; closes #10058
2013-10-31 10:55:18 -04:00
Karsten Loesing
d4af57a2c6
Add changelog entry for merged #7359 .
2013-10-31 09:21:13 +01:00
Nick Mathewson
f6fee77375
Add some clarity and checks to cell_queue_append_packed_copy
...
It's not cool to have "circ may be NULL if use_stats false, but
otherwise we crash" as an undocumented API constraint. :)
2013-10-30 23:03:20 -04:00
Nick Mathewson
83d9d72bf3
Merge remote-tracking branch 'karsten/morestats5'
2013-10-30 22:53:05 -04:00
Nick Mathewson
9b0a4cbe92
Add the -Wlogical-op switch when building with GCC 4.3 or later.
2013-10-30 22:39:53 -04:00
George Kadianakis
9e0ed8136a
Fix an always-true assert in PT code.
2013-10-29 22:49:37 +00:00
Nick Mathewson
4b6f074df9
Merge remote-tracking branch 'public/bug5018'
...
Conflicts:
src/or/entrynodes.c
2013-10-29 01:29:59 -04:00
David Fifield
2235d65240
Document that unneeded transports are ignored.
...
Suggested by Roger in
https://trac.torproject.org/projects/tor/ticket/5018#comment:11 .
2013-10-29 01:06:03 -04:00
David Fifield
e6e6c245c8
Simplify transport_is_needed.
...
By Roger at
https://trac.torproject.org/projects/tor/ticket/5018#comment:11 .
2013-10-29 01:05:57 -04:00
George Kadianakis
6f33dffec1
Only launch transport proxies that provide useful transports.
2013-10-29 01:05:56 -04:00
Karsten Loesing
2e0fad542c
Merge branch 'morestats4' into morestats5
...
Conflicts:
doc/tor.1.txt
src/or/config.c
src/or/connection.h
src/or/control.c
src/or/control.h
src/or/or.h
src/or/relay.c
src/or/relay.h
src/test/test.c
2013-10-28 12:09:42 +01:00
Karsten Loesing
e46de82c97
squash! Pass const uint64_t pointers, document array length.
...
Don't cast uint64_t * to const uint64_t * explicitly. The cast is always
safe, so C does it for us. Doing the cast explitictly can hide bugs if
the input is secretly the wrong type.
Suggested by Nick.
2013-10-28 10:48:18 +01:00
Roger Dingledine
49278cd68a
clarify that DisableNetwork closes connections too
2013-10-25 16:56:20 -04:00
Nick Mathewson
7578606a22
Merge remote-tracking branch 'public/bug9934_nm'
2013-10-25 12:15:31 -04:00
