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
Nick Mathewson
c95cc088c1
Tweak 5605 changes file
2013-10-25 12:07:15 -04:00
Nick Mathewson
f249074e41
Merge remote-tracking branch 'Ryman/bug5605'
2013-10-25 12:03:42 -04:00
Nick Mathewson
4b8282e50c
Log the origin address of controller connections
...
Resolves 9698; patch from "sigpipe".
2013-10-25 11:52:45 -04:00
Nick Mathewson
338bcad9e4
Make test_cmdline_args.py work with older pythons
...
I was using the assertIn() function on unit tests, which Python 2.7
introduced. But we'd like to be able to run our unit tests on Pythons
from older operating systems.
2013-10-21 14:35:01 -04:00
Nick Mathewson
b7a17de454
Better detection for certain broken cross-compiling situations.
...
Fixes bug 9869; patch from Benedikt Gollatz.
2013-10-21 13:30:38 -04:00
Nick Mathewson
21ac292820
Give a better warning when stack protection breaks linking.
...
Fix for 9948; patch from Benedikt Gollatz.
2013-10-21 13:07:47 -04:00
Nick Mathewson
71bd100976
DROPGUARDS controller command
...
Implements ticket 9934; patch from "ra"
2013-10-21 13:02:25 -04:00
Nick Mathewson
17d368281a
Merge remote-tracking branch 'linus/bug9206_option'
2013-10-16 11:20:43 -04:00
Nick Mathewson
1129362bd7
changes file for bug9651
2013-10-14 11:44:20 -04:00
Nick Mathewson
7f2415683a
Merge remote-tracking branch 'asn/bug9651'
2013-10-14 11:43:33 -04:00
Roger Dingledine
a26a5794a3
Merge branch 'maint-0.2.4'
2013-10-12 10:48:30 -04:00
Roger Dingledine
8f9fb63cdb
be willing to bootstrap from all three of our directory guards
...
Also fix a bug where if the guard we choose first doesn't answer, we
would try the second guard, but once we connected to the second guard
we would abandon it and retry the first one, slowing down bootstrapping.
The fix in both cases is to treat all our initially chosen guards as
acceptable to use.
Fixes bug 9946.
2013-10-12 10:42:27 -04:00
Nick Mathewson
d5f050111e
Fix out-of-tree "make check-local"
2013-10-11 13:42:27 -04:00
Nick Mathewson
f308adf838
When possible, run the ntor python integration tests too
2013-10-11 13:21:42 -04:00
Nick Mathewson
187398318e
When python is available, run the commandline unit tests from "make check"
2013-10-11 13:07:14 -04:00
Nick Mathewson
0546edde66
Merge branch 'bug1376'
2013-10-11 12:51:15 -04:00
Nick Mathewson
7ef9ecf6b3
Fix some whitespace; tighten the tests.
2013-10-11 12:51:07 -04:00
Nick Mathewson
6f9584b3fd
Make --version, --help, etc incremement quiet level, never decrease it
...
Fixes other case of #9578
2013-10-11 12:32:59 -04:00
Nick Mathewson
3e3b9219ec
Merge remote-tracking branch 'karsten/geoip-manual-update-oct2013'
2013-10-11 11:17:25 -04:00
Nick Mathewson
64293135df
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-10-11 11:17:18 -04:00
Nick Mathewson
7ef2939e5a
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-10-11 11:16:59 -04:00