Nick Mathewson
8eed82b3d4
Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5
2014-09-09 11:04:54 -04:00
Nick Mathewson
619bd43a5e
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-09 10:57:09 -04:00
Nick Mathewson
dd22ab519a
Merge remote-tracking branch 'public/bug12700_024' into maint-0.2.5
2014-09-09 10:51:39 -04:00
Nick Mathewson
a9d24f3304
Updated building-tor-msvc.txt
2014-09-09 10:33:45 -04:00
Nick Mathewson
4e98ec8149
Add instructions for building Tor with MSVC.
...
Written by "NewEraCracker" on ticket 13081; I've added a note that
this is not our preferred or supported build method.
2014-09-09 10:30:57 -04:00
Nick Mathewson
2997908228
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-09 10:27:41 -04:00
Nick Mathewson
8391c96091
Clean up the MVSC nmake files so they work again.
...
Fixes bug 13081; bugfix on 0.2.5.1-alpha. Patch from "NewEraCracker."
2014-09-09 10:27:05 -04:00
Nick Mathewson
ad0ae89b3c
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-09 10:22:42 -04:00
Nick Mathewson
a3c49ca79a
Add more escaped() calls in directory.c
...
Patch from teor to fix 13071.
2014-09-09 10:22:01 -04:00
Nick Mathewson
2ecaa59bd7
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-08 15:16:45 -04:00
Nick Mathewson
d229025fef
Expand the event_mask field in controller conns to 64 bits
...
Back in 078d6bcd
, we added an event number 0x20, but we didn't make
the event_mask field big enough to compensate.
Patch by "teor". Fixes 13085; bugfix on 0.2.5.1-alpha.
2014-09-08 15:16:02 -04:00
Nick Mathewson
781b477bc8
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-08 15:08:51 -04:00
Nick Mathewson
f551a053e3
Add cscope generated files to .gitignore.
...
Closes #13092 ; patch from dgoulet.
2014-09-08 15:07:54 -04:00
George Kadianakis
0f50f5f373
Evaluate TestingDirAuthVoteGuard only after filling all rs elements.
2014-09-06 14:37:41 +03:00
Andrea Shepard
39a017809b
Correctly update channel local mark when address of incoming connection changes after handshake; fixes bug #12160
2014-09-05 11:12:08 -07:00
Sebastian Hahn
8356721662
Fix add_fingerprint_to_dir() doc and signature
...
This function never returns non-null, but its usage doesn't reflect
that. Let's make it explicit. This will be mostly overridden by later
commits, so no changes file here.
2014-09-04 22:22:56 +02:00
Sebastian Hahn
10fe5bad9a
Remove the AuthDirRejectUnlisted config option
...
This is in preparation for a big patch series removing the entire Naming
system from Tor. In its wake, the approved-routers file is being
deprecated, and a replacement option to allow only pre-approved routers
is not being implemented.
2014-09-04 06:25:38 +02:00
Nick Mathewson
54348201f7
Merge remote-tracking branch 'intrigeri/bug12939-systemd-no-new-privileges'
...
Conflicts:
contrib/dist/tor.service.in
2014-09-03 13:29:43 -04:00
Nick Mathewson
f58cdb3be7
Merge remote-tracking branch 'intrigeri/bug12751-systemd-filesystem-sandbox'
2014-09-03 13:28:46 -04:00
Nick Mathewson
ed8f020e20
Fix a couple of small memory leaks on failure cases.
...
[CID 1234702, 1234703]
2014-09-03 10:59:39 -04:00
Nick Mathewson
c4d0d30bf3
Fix some 'dereference-before-null-check' warnings in test_circuitlist.c
...
Found by Coverity Scan.
[CID 1234704, 1234705, 1234706]
2014-09-03 10:59:10 -04:00
Nick Mathewson
0e66edb254
Fix the leaks that valgrind found in the new routerset tests.
...
(We have a tests-shouldn't-leak policy so that we won't accidentally
ignore true-positives.)
2014-09-03 09:51:14 -04:00
Nick Mathewson
9ab35b0a2e
Use 'Bytes', not 'B', in torrc.sample.
...
Also put this change into torrc.minimal.in-staging
Closes ticket 10343
2014-09-02 19:18:21 -04:00
Magnus Nord
d0113a0c2a
Fix: typo in torrc.sample.in
2014-09-02 19:16:16 -04:00
Nick Mathewson
8a79b56ac6
Divide torrc.sample into torrc.sample and torrc.minimal
...
torrc.minimal is now the one that should change as infrequently as
possible. To schedule an change to go into it eventually, make your
change to torrc.minimal.in-sample.
torrc.sample is now the volatile one: we can change it to our hearts'
content.
Closes ticket #11144
2014-09-02 19:14:30 -04:00
Nick Mathewson
d19cbf3ab1
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-02 19:00:00 -04:00
rl1987
dcb4ee5b83
Documenting reject6 and accept6 ExitPolicy entries in manpage.
2014-09-02 18:58:00 -04:00
Sebastian Hahn
962765a35d
Don't list relays w/ bw estimate of 0 in the consensus
...
This implements a feature from bug 13000. Instead of starting a bwauth
run with this wrong idea about their bw, relays should do the self-test
and then get measured.
2014-09-02 18:55:01 -04:00
Sebastian Hahn
14abf1c3f1
Don't delay uploading a new desc if bw estimate was 0
...
When a tor relay starts up and has no historical information about its
bandwidth capability, it uploads a descriptor with a bw estimate of 0.
It then starts its bw selftest, but has to wait 20 minutes to upload the
next descriptor due to the MAX_BANDWIDTH_CHANGE_FREQ delay. This change
should mean that on average, relays start seeing meaningful traffic a
little quicker, since they will have a higher chance to appear in the
consensus with a nonzero bw.
Patch by Roger, changes file and comment by Sebastian.
2014-09-02 18:54:56 -04:00
Nick Mathewson
bce32e0a35
Fix more (void*)11 warnings in the tests
2014-09-02 15:40:47 -04:00
Nick Mathewson
a14c6cb70f
Make iter for DECLARE_TYPED_DIGESTMAP_FNS be a pointer.
...
This fixes a clangalyzer warning, and makes our C slightly better C.
2014-09-02 15:40:04 -04:00
Nick Mathewson
44f0dfa53b
Use real pointers in unit tests, not (void*)101 etc
...
The clangalyzer hates (void*)101 etc
2014-09-02 13:56:54 -04:00
Nick Mathewson
32b88d2565
Don't include a backtrace test for dereferencing 0 under analyzers
...
They hate this.
2014-09-02 13:56:31 -04:00
Nick Mathewson
9b850f9200
Add more assertions to esc_for_log to please the clangalyzer.
2014-09-02 13:29:45 -04:00
Nick Mathewson
07a16b3372
Add an assertion to read_file_to_str_until_eof
...
The clangalyzer doesn't believe our math here. I'm pretty sure our
math is right. Also, add some unit tests.
2014-09-02 13:29:11 -04:00
Nick Mathewson
1a2f2c163f
Explicitly initialize addresses in tor_ersatz_socketpair
...
This should stop a false positive from the clangalyzer.
2014-09-02 12:58:32 -04:00
Nick Mathewson
57c48bf734
Apply the MALLOC_ZERO_WORKS fixup to tor_realloc as well.
...
Also, make MALLOC_ZERO_WORKS never get applied when clang analyzer is
running. This should make the clangalyzer a little happier.
2014-09-02 12:55:20 -04:00
Nick Mathewson
00ffccd9a6
Another clang analyzer complaint wrt HT_GENERATE
...
We're calling mallocfn() and reallocfn() in the HT_GENERATE macro
with the result of a product. But that makes any sane analyzer
worry about overflow.
This patch keeps HT_GENERATE having its old semantics, since we
aren't the only project using ht.h. Instead, define a HT_GENERATE2
that takes a reallocarrayfn.
2014-09-02 12:48:34 -04:00
Nick Mathewson
e3c143f521
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-02 11:58:08 -04:00
Nick Mathewson
efcab43956
Fix a number of clang analyzer false-positives
...
Most of these are in somewhat non-obvious code where it is probably
a good idea to initialize variables and add extra assertions anyway.
Closes 13036. Patches from "teor".
2014-09-02 11:56:56 -04:00
Nick Mathewson
67c0ad5426
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-09-01 16:23:34 -04:00
rl1987
8139db3725
Adding changes file.
2014-09-01 16:22:52 -04:00
Nick Mathewson
87f9c51f64
Avoid unsigned/sign compare warning from last patch.
2014-09-01 15:42:17 -04:00
Philip Van Hoof
60a3897ed9
Bounds check while looping over a fixed size table or array
...
(Edited to use existing ARRAY_LENGTH macro --nickm)
2014-09-01 15:40:47 -04:00
Nick Mathewson
f113a263de
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-08-29 16:45:56 -04:00
Nick Mathewson
41058dce95
Merge remote-tracking branch 'arma/bug12996b' into maint-0.2.5
2014-08-29 16:44:50 -04:00
Roger Dingledine
7a878c192f
Downgrade "Unexpected onionskin length after decryption" warning
...
It's now a protocol-warn, since there's nothing relay operators can
do about a client that sends them a malformed create cell.
Resolves bug 12996; bugfix on 0.0.6rc1.
2014-08-29 16:38:54 -04:00
Nick Mathewson
d6fa8239c8
Merge remote-tracking branch 'origin/maint-0.2.5'
2014-08-29 16:13:04 -04:00
Nick Mathewson
4a6f5bb2dd
Improve "Tried to establish rendezvous on non-OR or non-edge circuit"
...
Instead of putting it all in one warning message, log what exactly
was wrong with the circuit.
Resolves ticket 12997.
2014-08-29 16:05:58 -04:00
Nick Mathewson
573d62748a
Fix some coverity warnings in new routerset tests
2014-08-29 15:09:27 -04:00