Nick Mathewson
412bcc5b2a
Merge remote-tracking branch 'tor-github/pr/926' into maint-0.4.0
2019-04-10 11:31:33 -04:00
George Kadianakis
2cdc6b2005
Add changes file for #30040 .
2019-04-10 12:46:27 +03:00
teor
12b9bfc05f
test: Also avoid reading the system default torrc in integration tests
...
Part of 29702.
2019-04-10 19:03:43 +10:00
rl1987
acec0192c3
Add changes file
2019-04-10 18:45:36 +10:00
teor
454bdb22ee
Merge remote-tracking branch 'tor-github/pr/920' into maint-0.4.0
2019-04-10 18:26:49 +10:00
Nick Mathewson
c24928dd8f
Changes file for bug30041
2019-04-09 12:05:33 -04:00
Nick Mathewson
c10011532e
Changes file for bug30041
2019-04-09 12:03:22 -04:00
George Kadianakis
c7cf49dc3c
Merge branch 'tor-github/pr/915' into maint-0.4.0
2019-04-09 12:24:52 +03:00
teor
92e8bdf296
Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0
2019-04-09 11:35:41 +10:00
rl1987
61e6b217c5
manpage: Clarify that Tor does stream isolation between *Port listeners by default
...
cherry-pick of tor-github/pr/841 to maint-0.4.0.
2019-04-09 11:34:51 +10:00
Nick Mathewson
a63bd87760
Detect and suppress an additional gmtime() warning in test_util.c
...
Fixes bug 29922; bugfix on 0.2.9.3-alpha when we tried to capture
all these warnings. No need to backport any farther than 0.3.5,
though -- these warnings don't cause test failures before then.
This one was tricky to find because apparently it only happened on
_some_ windows builds.
2019-04-08 17:02:14 -04:00
teor
b100c9e980
Merge remote-tracking branch 'tor-github/pr/911' into maint-0.4.0
2019-04-06 12:15:41 +10:00
teor
4dd96f7444
changes: Ticket 29241 is actually a bug on NSS in 0.3.5.1-alpha
2019-04-06 11:07:20 +10:00
Nick Mathewson
5cb94cbf9d
NSS: disable TLS1.2 SHA-384 ciphersuites.
...
In current NSS versions, these ciphersuites don't work with
SSL_ExportKeyingMaterial(), which was causing relays to fail when
they tried to negotiate the v3 link protocol authentication.
Fixes bug 29241; bugfix on 0.4.0.1-alpha.
2019-04-06 11:06:34 +10:00
Nick Mathewson
680fd3f8fb
NSS: Log an error message when SSL_ExportKeyingMaterial() fails
...
Diagnostic for 29241.
2019-04-06 11:06:22 +10:00
teor
48e990359b
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-06 09:33:11 +10:00
teor
316aed502e
Merge remote-tracking branch 'tor-github/pr/898' into maint-0.3.5
2019-04-06 09:32:53 +10:00
teor
ea5e371822
Merge remote-tracking branch 'tor-github/pr/903' into maint-0.3.5
2019-04-06 09:31:52 +10:00
teor
44ea341117
Merge remote-tracking branch 'tor-github/pr/879' into maint-0.3.5
2019-04-06 09:30:52 +10:00
teor
102178e6d4
Merge remote-tracking branch 'tor-github/pr/878' into maint-0.3.4
2019-04-06 09:30:04 +10:00
teor
a0db5ade3e
Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9
2019-04-06 09:28:58 +10:00
teor
e1955a2c54
Merge remote-tracking branch 'tor-github/pr/877' into maint-0.2.9
2019-04-06 09:28:13 +10:00
George Kadianakis
071a000d67
Merge branch 'tor-github/pr/906' into maint-0.4.0
2019-04-05 16:44:59 +03:00
George Kadianakis
2cc3c98bc4
Merge branch 'tor-github/pr/901' into maint-0.4.0
2019-04-05 14:56:52 +03:00
George Kadianakis
7fe169a500
Merge branch 'tor-github/pr/879' into maint-0.4.0
2019-04-05 14:55:09 +03:00
George Kadianakis
217db9efe1
Merge branch 'tor-github/pr/902' into maint-0.4.0
2019-04-05 14:53:33 +03:00
George Kadianakis
747b74c182
Merge branch 'tor-github/pr/800' into maint-0.4.0
2019-04-05 14:51:21 +03:00
Mike Perry
28db7646ba
Changes file for bug 29500.
2019-04-05 12:14:18 +10:00
Nick Mathewson
d016bbaa7d
Merge branch 'bug29959_040_squashed' into maint-0.4.0
2019-04-04 20:26:47 -04:00
teor
8e961b2174
bwauth: Actually include the bandwidth-file-digest in authority votes
...
Fixes bug 29959; bugfix on 0.4.0.2-alpha.
2019-04-04 20:26:09 -04:00
Nick Mathewson
d194f6bedf
Implement an DormantCanceledByStartup option
...
Closes ticket 29357, and comes with appropriate notions of caution.
2019-04-04 11:48:36 -04:00
Nick Mathewson
db1c1dba34
Merge branch 'bug30021_029' into bug30021_035
2019-04-04 11:26:33 -04:00
Nick Mathewson
1710f4bbd6
Do not cache bogus results from classifying client ciphers
...
When classifying a client's selection of TLS ciphers, if the client
ciphers are not yet available, do not cache the result. Previously,
we had cached the unavailability of the cipher list and never looked
again, which in turn led us to assume that the client only supported
the ancient V1 link protocol. This, in turn, was causing Stem
integration tests to stall in some cases. Fixes bug 30021; bugfix
on 0.2.4.8-alpha.
2019-04-04 11:24:55 -04:00
teor
ef06ef217a
Merge branch 'bug30011_035' into bug30011_040
...
Merge bug30011 new package timelimit with 0.4.0 new package shellcheck.
Move shellcheck into the correct category.
2019-04-04 13:23:26 +10:00
teor
3fa42d599a
Travis: Terminate test-stem if it takes more than 9.5 minutes to run
...
(Travis terminates the job after 10 minutes of no output.)
Diagnostic for 29437.
Fixes bug 30011; bugfix on 0.3.5.4-alpha.
2019-04-04 13:21:35 +10:00
Nick Mathewson
5613968d57
Improve logging for 28614.
...
When we fixed 28614, our answer was "if we failed to load the
consensus on windows and it had a CRLF, retry it." But we logged
the failure at "warn", and we only logged the retry at "info".
Now we log the retry at "notice", with more useful information.
Fixes bug 30004.
2019-04-03 14:30:56 -04:00
Nick Mathewson
99b87d7ca4
Even more diagnostic messages for bug 28223.
...
Try to figure out _where exactly_ we are first encountering NULs in
microdescriptors, and what we are doing when that happens.
2019-04-03 13:53:06 -04:00
George Kadianakis
42aae0e693
Merge branch 'tor-github/pr/867' into maint-0.4.0
2019-04-03 17:59:02 +03:00
George Kadianakis
828f1829c8
Merge branch 'tor-github/pr/811' into maint-0.4.0
2019-04-03 17:50:49 +03:00
Nick Mathewson
367dd9cf02
30001: Fix a race condition in test_dir_handle_get.c
...
Previously we used time(NULL) to set the Expires: header in our HTTP
responses. This made the actual contents of that header untestable,
since the unit tests have no good way to override time(), or to see
what time() was at the exact moment of the call to time() in
dircache.c.
This gave us a race in dir_handle_get/status_vote_next_bandwidth,
where the time() call in dircache.c got one value, and the call in
the tests got another value.
I'm applying our regular solution here: using approx_time() so that
the value stays the same between the code and the test. Since
approx_time() is updated on every event callback, we shouldn't be
losing any accuracy here.
Fixes bug 30001. Bug introduced in fb4a40c32c4a7e5; not in any
released Tor.
2019-04-03 10:16:18 -04:00
Nick Mathewson
de76862fd6
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-03 09:27:44 -04:00
Nick Mathewson
4aa02d3c7a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-03 09:27:43 -04:00
Nick Mathewson
3cfcfbac46
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-03 09:27:42 -04:00
Karsten Loesing
54e249e269
Update geoip and geoip6 to the April 2 2019 database.
2019-04-03 09:26:28 +02:00
teor
9242f32883
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-04-02 11:45:31 +10:00
teor
0418d4081a
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-04-02 11:45:22 +10:00
teor
74775b2dfd
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-04-02 11:45:13 +10:00
teor
7014e57f4a
Merge branch 'bug29036-29962-034' into bug29036-29962-035
...
Merge the moved coverage line from 29036 with the stem changes in
maint-0.3.5.
2019-04-01 14:11:20 +10:00
rl1987
124990aa01
Add changes file
2019-04-01 14:08:24 +10:00
teor
ac28e56ccb
Merge branch 'bug29036-029' into bug29036-29962-034
2019-04-01 14:07:58 +10:00
teor
eb0bd18d6e
changes: Use the first Tor version with CI coverage for the 29036 changes file
...
Otherwise, "make check-changes" will complain when we backport the change.
2019-04-01 13:40:16 +10:00
teor
194b25f0c7
dircache: Refactor handle_get_next_bandwidth() to use connection_dir_buf_add()
...
Implements ticket 29897.
2019-03-29 17:26:30 +10:00
rl1987
c2222ba169
Add changes file
2019-03-29 17:26:09 +10:00
teor
6d188fb4cc
Merge remote-tracking branch 'tor-github/pr/835' into maint-0.4.0
2019-03-27 12:31:07 +10:00
teor
6d057c56f1
Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4
2019-03-27 10:01:45 +10:00
teor
9ae8d663ea
Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0
2019-03-27 09:36:26 +10:00
George Kadianakis
06951cb3fc
Merge branch 'tor-github/pr/847' into maint-0.4.0
2019-03-26 15:16:21 +02:00
teor
4258728d56
Merge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0
2019-03-26 19:15:46 +10:00
juga0
6ecf9590ea
changes: add file for #21377
2019-03-26 17:41:21 +10:00
teor
828033001b
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0
2019-03-26 16:56:45 +10:00
rl1987
669ec64325
Fix CID 1444119
...
Let's use the same function exit point for BUG() codepath that we're using
for every other exit condition. That way, we're not forgetting to clean up
the memarea.
2019-03-26 12:24:45 +10:00
teor
b76ae3898d
Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged
2019-03-26 11:48:52 +10:00
Taylor Yu
5d2f5e482e
Correctly report PT vs proxy during bootstrap
...
Previously, or_connection_t did not record whether or not the
connection uses a pluggable transport. Instead, it stored the
underlying proxy protocol of the pluggable transport in
proxy_type. This made bootstrap reporting treat pluggable transport
connections as plain proxy connections.
Store a separate bit indicating whether a pluggable transport is in
use, and decode this during bootstrap reporting.
Fixes bug 28925; bugfix on 0.4.0.1-alpha.
2019-03-25 14:13:45 +10:00
Alexander Færøy
4be522b2e6
Pass NULL to lpApplicationName in CreateProcessA().
...
When NULL is given to lpApplicationName we enable Windows' "magical"
path interpretation logic, which makes Tor 0.4.x behave in the same way
as previous Tor versions did when it comes to executing binaries in
different system paths.
For more information about this have a look at the CreateProcessA()
documentation on MSDN -- especially the string interpretation example is
useful to understand this issue.
This bug was introduced in commit bfb94dd2ca
.
See: https://bugs.torproject.org/29874
2019-03-25 03:10:37 +01:00
George Kadianakis
a5df9402b6
prob-distr: Decrease false positive rate of stochastic tests.
2019-03-22 11:16:30 -04:00
teor
f7688cb179
test: Backport the 0.3.4 src/test/test-network.sh to 0.2.9
...
We need a recent test-network.sh to use new chutney features in CI.
Fixes bug 29703; bugfix on 0.2.9.1-alpha.
2019-03-22 13:20:23 +10:00
teor
3adb689fbc
Merge branch 'ticket29806_034_squashed' into ticket29806_035_squashed_merged
...
Copy and paste the vote=0 code from the old src/or/dirserv.c
to the new src/feature/dirauth/bwauth.c.
2019-03-21 12:04:30 +10:00
juga0
4ab2e9a599
bwauth: Ignore bandwidth file lines with "vote=0"
...
so that the relays that would be "excluded" from the bandwidth
file because of something failed can be included to diagnose what
failed, without still including these relays in the bandwidth
authorities vote.
Closes #29806 .
2019-03-21 12:00:45 +10:00
Alexander Færøy
0267c453e2
Run make reset-gcov
after the script target in Travis CI is done.
...
This should ensure that GCDA files are never entering the cache of
Travis CI.
See: https://bugs.torproject.org/29036
2019-03-20 15:22:39 +01:00
teor
cfcf6de1a8
Changes file for bug 29527
...
The previous commit introduces these changes:
Stop warning about undefined behavior in the probability distribution
tests. Float division by zero may technically be undefined behaviour in
C, but it's well-defined in IEEE 754.
Partial backport of 29298.
Closes ticket 29527; bugfix on 0.4.0.1-alpha.
2019-03-20 18:07:00 +10:00
teor
41cd05562f
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-20 09:48:03 +10:00
teor
6bf9078ceb
Merge remote-tracking branch 'tor-github/pr/798' into maint-0.3.5
2019-03-20 09:47:31 +10:00
teor
db2ac3b9fe
Merge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9
2019-03-20 09:46:10 +10:00
teor
b4483edce0
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-19 15:43:33 +10:00
teor
17e3eea685
Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5
2019-03-19 15:43:05 +10:00
teor
1d0146e2a2
Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
2019-03-18 11:27:59 +10:00
Nick Mathewson
1547fd99a6
Merge branch 'bug28656_035_squashed' into maint-0.4.0
2019-03-15 08:59:19 -04:00
teor
532f4c9103
Stop logging a BUG() warning when tor is waiting for exit descriptors
...
Fixes bug 28656; bugfix on 0.3.5.1-alpha.
2019-03-15 08:57:28 -04:00
Nick Mathewson
94523bffdc
Merge remote-tracking branch 'tor-github/pr/791' into maint-0.4.0
2019-03-15 08:52:50 -04:00
Roger Dingledine
a3bc950e42
relays shouldn't close idle rend circuits
...
Allow connections to single onion services to remain idle without being
disconnected.
Relays acting as rendezvous points for single onion services were
mistakenly closing idle established rendezvous circuits after 60 seconds,
thinking that they are unused directory-fetching circuits that had served
their purpose.
Fixes bug 29665; bugfix on 0.2.1.26.
2019-03-14 12:54:16 +02:00
Roger Dingledine
add0f89c14
relays shouldn't close idle rend circuits
...
Allow connections to single onion services to remain idle without being
disconnected.
Relays acting as rendezvous points for single onion services were
mistakenly closing idle established rendezvous circuits after 60 seconds,
thinking that they are unused directory-fetching circuits that had served
their purpose.
Fixes bug 29665; bugfix on 0.2.1.26.
2019-03-14 12:53:33 +02:00
teor
e021f89f36
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-03-14 06:56:38 +10:00
teor
f3b17a6b26
Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4
2019-03-14 06:56:09 +10:00
teor
c03b1b3f08
Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4
2019-03-14 06:55:57 +10:00
teor
66f944f79b
Merge branch 'bug28096-029-squashed' into bug28096-034-squashed
...
Merge the new code, and preserve the #else macro comment from 0.3.4.
2019-03-14 06:53:17 +10:00
teor
2840580cf2
Merge remote-tracking branch 'nickm/bug27073_029' into bug27073_034
...
Replace == with OP_EQ in test macros.
2019-03-14 06:47:32 +10:00
teor
5606cfae47
Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4
2019-03-14 06:41:14 +10:00
teor
8bd9b2a6a0
Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9
2019-03-14 06:37:50 +10:00
teor
90301247fd
Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9
2019-03-14 06:37:17 +10:00
teor
530304dd77
Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9
2019-03-14 06:36:47 +10:00
teor
eaa84234c9
Merge remote-tracking branch 'tor-github/pr/510' into maint-0.2.9
2019-03-14 06:36:11 +10:00
teor
9daae1b302
Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9
2019-03-14 06:35:05 +10:00
George Kadianakis
ec2a2a6b7a
Fix #28525 changes file that is breaking CI.
2019-03-12 20:11:51 +02:00
George Kadianakis
0ce32affc2
Merge branch 'tor-github/pr/763' into maint-0.4.0
2019-03-12 18:11:35 +02:00
Nick Mathewson
9c9214f2c9
Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
2019-03-12 11:03:37 -04:00
teor
c7854933e9
Merge branch bug29706_029_refactor into bug29706_034_refactor
2019-03-12 11:31:52 +10:00
teor
26e6f56023
sr: Free SRVs before replacing them in state_query_put_()
...
Refactor the shared random state's memory management so that it actually
takes ownership of the shared random value pointers.
Fixes bug 29706; bugfix on 0.2.9.1-alpha.
2019-03-09 12:03:00 +10:00
teor
9400da9b5e
test/sr: Free SRVs before replacing them in test_sr_setup_srv()
...
Stop leaking parts of the shared random state in the shared-random unit
tests. The previous fix in 29599 was incomplete.
Fixes bug 29706; bugfix on 0.2.9.1-alpha.
2019-03-09 11:59:52 +10:00
Nick Mathewson
c40d53ab39
Merge branch 'pr_719_squashed_040' into maint-0.4.0
2019-03-08 10:25:43 -05:00
Mike Perry
ff410edec0
Bug 29204: Inspect circuit queues before sending padding.
...
Mitigates OOM conditions at relays.
2019-03-08 10:25:28 -05:00
David Goulet
b4e44a371f
hs-v2: Copy needed information between service on prunning
...
Turns out that when reloading a tor configured with hidden service(s), we
weren't copying all the needed information between the old service object to
the new one.
For instance, the desc_is_dirty timestamp wasn't which could lead to the
service uploading its descriptor much later than it would need to.
The replaycache wasn't also moved over and some intro point information as
well.
Fixes #23790
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-03-08 09:59:04 -05:00
teor
ffd7207025
Merge remote-tracking branch 'tor-github/pr/733' into maint-0.3.5
2019-03-08 14:11:14 +10:00
teor
08ddf1f62b
Merge remote-tracking branch 'bug28525_029' into maint-0.3.5
2019-03-08 12:33:00 +10:00
Neel Chauhan
63b4049114
Make tor_addr_is_internal_() RFC6598 (Carrier Grade NAT) aware
...
Fixes 28525.
2019-03-08 12:19:12 +10:00
Nick Mathewson
3af943dcd1
Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0
2019-03-07 08:56:35 -05:00
Nick Mathewson
d8409ccb76
Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0
2019-03-07 08:34:15 -05:00
Nick Mathewson
9b4ecbaa7d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-06 14:29:43 -05:00
Nick Mathewson
d6f77b99da
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-06 14:29:38 -05:00
Nick Mathewson
155b0f5521
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-03-06 14:29:33 -05:00
Nick Mathewson
0c9cd7c487
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-03-06 14:29:29 -05:00
Karsten Loesing
2e74edb53e
Update geoip and geoip6 to the March 4 2019 database.
2019-03-06 11:45:27 +01:00
David Goulet
a999cb43df
protover: Add missing Padding to translate_to_rust
...
This commit also explicitly set the value of the PRT enum so we can match/pin
the C enum values to the Rust one in protover/ffi.rs.
Fixes #29631
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-03-05 12:33:43 -05:00
teor
7786198eef
Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
2019-03-01 14:15:00 +10:00
teor
c1ab538479
Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9
2019-03-01 14:14:51 +10:00
teor
ecbc2e80a0
Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9
2019-03-01 14:14:26 +10:00
Mike Perry
e8d84b18aa
Bug 25733: Avoid assert failure if all circuits time out.
...
Prior to #23100 , we were not counting HS circuit build times in our
calculation of the timeout. This could lead to a condition where our timeout
was set too low, based on non HS circuit build times, and then we would
abandon all HS circuits, storing no valid timeouts in the histogram.
This commit avoids the assert.
2019-03-01 13:48:01 +10:00
Kris Katterjohn
389ee834b6
Log the correct "auto" port number for listening sockets
...
When "auto" was used for the port number for a listening socket, the
message logged after opening the socket would incorrectly say port 0
instead of the actual port used.
Fixes bug 29144; bugfix on 0.3.5.1-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-03-01 12:34:21 +10:00
Nick Mathewson
dc19d65c3b
Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0
2019-02-28 11:20:26 -05:00
teor
be29dfedd9
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:45:59 +10:00
teor
524731503e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-28 10:45:44 +10:00
teor
3313444ef0
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-28 10:45:30 +10:00
teor
a479909ee8
appveyor: skip two redundant builds to speed up CI on Windows
...
Skip the Appveyor 32-bit Windows Server 2016 job, and 64-bit Windows
Server 2012 R2 job. The remaining 2 jobs still provide coverage of
64/32-bit, and Windows Server 2016/2012 R2.
Also set fast_finish, so failed jobs terminate the build immediately.
Fixes bug 29601; bugfix on 0.3.5.4-alpha.
2019-02-28 07:43:57 +10:00
Nick Mathewson
56f01e58b4
Merge remote-tracking branch 'tor-github/pr/731' into maint-0.4.0
2019-02-27 09:59:33 -05:00
teor
64e082e892
Merge branch 'bug29599_029' into bug29599_033
2019-02-27 15:06:39 +10:00
teor
4d9eb4dd0e
test/shared-random: Stop leaking shared random state in the unit tests
...
Stop leaking parts of the shared random state in the shared-random unit
tests.
Fixes bug 29599; bugfix on 0.2.9.1-alpha.
2019-02-27 15:04:40 +10:00
teor
15dc33849e
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-27 09:38:04 +10:00
teor
1a194beb2c
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-27 09:37:50 +10:00
teor
6c966b894c
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-27 09:37:36 +10:00
David Goulet
a5dd41b9af
Merge branch 'tor-github/pr/638' into maint-0.4.0
2019-02-26 11:24:43 -05:00
David Goulet
9c4ec414bd
Merge branch 'tor-github/pr/692' into maint-0.4.0
2019-02-26 10:47:54 -05:00
David Goulet
1216f99534
Merge branch 'tor-github/pr/691' into maint-0.3.5
2019-02-26 10:46:52 -05:00
Alexander Færøy
aa360b255b
Fix crash bug in PT subsystem.
...
This patch fixes a crash bug (assertion failure) in the PT subsystem
that could get triggered if the user cancels bootstrap via the UI in
TorBrowser. This would cause Tor to call `managed_proxy_destroy()` which
called `process_free()` after it had called `process_terminate()`. This
leads to a crash when the various process callbacks returns with data
after the `process_t` have been freed using `process_free()`.
We solve this issue by ensuring that everywhere we call
`process_terminate()` we make sure to detach the `managed_proxy_t` from
the `process_t` (by calling `process_set_data(process, NULL)`) and avoid
calling `process_free()` at all in the transports code. Instead we just
call `process_terminate()` and let the process exit callback in
`managed_proxy_exit_callback()` handle the `process_free()` call by
returning true to the process subsystem.
See: https://bugs.torproject.org/29562
2019-02-26 15:43:09 +01:00
Nick Mathewson
35257a1c69
Merge remote-tracking branch 'tor-github/pr/726' into maint-0.4.0
2019-02-26 07:27:42 -05:00
teor
cc23afddd1
Changes file for backporting 29530 to 0.3.5
2019-02-26 09:58:52 +10:00
Kris Katterjohn
1b9e77349f
Fix some error-checking logic and a misleading error message
...
When IPv4Only (IPv6Only) was used but the address could not be
interpreted as a IPv4 (IPv6) address, the error message referred
to the wrong IP version.
This also fixes up the error-checking logic so it's more precise
about what's being checked.
Fixes bug 13221; bugfix on 0.2.3.9-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-02-25 16:03:42 -06:00
Nick Mathewson
00a93b19cf
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-02-21 10:08:14 -05:00
Nick Mathewson
4a8a1f76ea
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-21 10:08:14 -05:00
Nick Mathewson
5062647918
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-21 10:08:14 -05:00
David Goulet
be84ed1a64
kist: Don't write above the highwater outbuf mark
...
KIST works by computing how much should be allowed to write to the kernel for
a given socket, and then it writes that amount to the outbuf.
The problem is that it could be possible that the outbuf already has lots of
data in it from a previous scheduling round (because the kernel is full/busy
and Tor was not able to flush the outbuf yet). KIST ignores that the outbuf
has been filling (is above its "highwater") and writes more anyway. The end
result is that the outbuf length would exceed INT_MAX, hence causing an
assertion error and a corresponding "Bug()" message to get printed to the
logs.
This commit makes it for KIST to take into account the outbuf length when
computing the available space.
Bug found and patch by Rob Jansen.
Closes #29168 . TROVE-2019-001.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-21 10:07:34 -05:00
Roger Dingledine
249319ec5d
fix typos from #28614
2019-02-20 10:32:47 -05:00
Nick Mathewson
97e1539f7f
Merge remote-tracking branch 'tor-github/pr/706' into maint-0.4.0
2019-02-19 11:53:02 -05:00
Nick Mathewson
4df31adef7
Merge remote-tracking branch 'tor-github/pr/704' into maint-0.4.0
2019-02-19 11:51:19 -05:00
Nick Mathewson
4bc55ed5ee
Merge branch 'bug29145_029' into maint-0.4.0
2019-02-19 11:49:20 -05:00
Kris Katterjohn
4417ac880a
Fix a compiler warning on OpenBSD
...
malloc_options needs to be declared extern (and declaring it extern
means we need to initialize it separately)
Fixes bug 29145; bugfix on 0.2.9.3-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-02-19 11:38:32 -05:00
Nick Mathewson
26873bc4ed
Merge branch 'bug28698_035' into maint-0.4.0
2019-02-19 11:27:18 -05:00
José M. Guisado
78220aae1e
Add circuit time check before logging about relaxing circuit time
...
Signed-off-by: José M. Guisado <guigom@riseup.net>
2019-02-19 11:24:51 -05:00
Nick Mathewson
5c87add923
Merge remote-tracking branch 'tor-github/pr/701' into maint-0.4.0
2019-02-19 11:21:51 -05:00
rl1987
6fdd34acd6
Remove check-tor script
2019-02-15 19:18:24 +02:00
Matt Traudt
b054a6c6b9
kist: When readding chans, check correct chan's sched_heap_idx
...
Closes #29508
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-14 16:19:31 -05:00
George Kadianakis
00b073b1bc
Merge branch 'maint-0.3.5'
2019-02-14 18:01:07 +02:00
George Kadianakis
d83c299eba
Merge branch 'tor-github/pr/689' into maint-0.3.5
2019-02-14 18:00:05 +02:00
George Kadianakis
9bfe4ed6dd
Merge branch 'tor-github/pr/536' into maint-0.3.5
2019-02-14 17:39:34 +02:00
George Kadianakis
f5a6d4c6ea
Disable unstable circuit padding unittest.
...
until #29298 is implemented.
2019-02-14 12:09:41 +02:00
Nick Mathewson
5f42bc0f48
Merge remote-tracking branch 'tor-github/pr/699'
2019-02-13 15:19:59 -05:00
Nick Mathewson
5687165cf1
Merge remote-tracking branch 'tor-github/pr/674'
2019-02-13 11:38:35 -05:00
David Goulet
d5de1a0a55
Merge branch 'tor-github/pr/651'
2019-02-13 11:02:02 -05:00
David Goulet
6efc2a0e1f
Merge branch 'tor-github/pr/650' into maint-0.3.5
2019-02-13 10:56:24 -05:00
juga0
b61c3c6dfa
changes: Add changes file for #26698
2019-02-13 12:26:00 +00:00
David Goulet
c320c52e89
Merge branch 'tor-github/pr/690'
2019-02-12 13:04:25 -05:00
David Goulet
95e5f8fe03
Merge branch 'tor-github/pr/671'
2019-02-12 13:02:30 -05:00
Nick Mathewson
72b978c3a5
On windows, if we fail to load a consensus and it has a CRLF, retry.
...
Fixes bug 28614; bugfix on 0.4.0.1-alpha when we started mmapping
the consensus.
2019-02-12 12:57:33 -05:00
Nick Mathewson
a797a69679
Merge branch 'maint-0.3.5'
2019-02-12 09:56:50 -05:00
Nick Mathewson
db209d4dba
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-12 09:56:49 -05:00
Nick Mathewson
7ead2af622
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-12 09:56:49 -05:00
Nick Mathewson
2e770216c4
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-12 09:56:49 -05:00
Karsten Loesing
a3f9ddcf03
Update geoip and geoip6 to the February 5 2019 database.
2019-02-12 14:40:42 +01:00
Nick Mathewson
f2b646a2b6
Merge branch 'ticket29435_035' into ticket29435_040
2019-02-08 10:47:04 -05:00
Nick Mathewson
192b312c97
Fix coverage script.
...
It was looking for object files made with the old automake
directorations, but those changed when we split up our libraries.
Fixes bug 29435; bugfix on 0.3.5.1-alpha.
2019-02-08 10:43:38 -05:00
Nick Mathewson
b63404ebba
Changes file for ticket29026.
2019-02-08 08:52:46 -05:00
Nick Mathewson
7f59b9fb1f
Merge branch 'maint-0.3.5'
2019-02-08 08:37:46 -05:00
Nick Mathewson
ab65347819
Merge branch 'ticket29040_1_changes' into maint-0.3.5
2019-02-08 08:37:43 -05:00
Nick Mathewson
eca0f87801
Add changes file for bug 29040.
2019-02-08 08:37:23 -05:00
Nick Mathewson
b1ae2fd65b
Merge branch 'maint-0.3.5'
2019-02-08 08:19:34 -05:00
Nick Mathewson
4b36f9676d
Merge remote-tracking branch 'tor-github/pr/670' into maint-0.3.5
2019-02-08 08:19:31 -05:00
Roger Dingledine
bfd1d70243
Merge branch 'maint-0.3.5'
2019-02-05 08:10:43 -05:00
Roger Dingledine
bca25eebfb
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-05 08:10:14 -05:00
Roger Dingledine
8ea98c0f4c
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-05 08:09:47 -05:00
Peter Gerber
83b1ca9b07
Add release note for bug 29150
2019-02-02 23:10:16 +00:00
Nick Mathewson
4d7a0a1310
Update Cargo.lock with new comment; suppress 29244.
2019-02-01 16:38:23 +01:00
rl1987
58cbe51708
Use RFC5737-compliant example IP addresses in manpage when describing MapAddress
2019-01-30 17:13:40 +02:00
Nick Mathewson
bbd893d6bd
Write consensus files in binary mode
...
This will help us out on windows now that we mmap files. Fixes part
of ticket 28614.
2019-01-29 16:18:41 +01:00
rl1987
790150e57a
Allow empty username/password in SOCKS5 username/password auth message
2019-01-26 11:06:33 +02:00
Nick Mathewson
e19222a0da
Use tt_u64_op() in test_circuitpadding.c to fix compilation warnings
...
Fixes bug 29169.
2019-01-24 13:20:21 -05:00
Nick Mathewson
8b254c1c70
Merge branch 'precommit_squashed'
2019-01-24 11:08:10 -05:00
rl1987
99fffc6c2f
Add a pre-commit hook that runs code and changelog entry formatting checks
2019-01-24 08:03:17 -05:00
Nick Mathewson
d23704bf26
Merge branch 'ticket28668_035' into ticket28668_040
2019-01-23 14:50:22 -05:00
Nick Mathewson
6144cf99ad
Capture more BUG warnings in util/time test
...
These are ones that happen on windows only.
Fixes bug 29161.
2019-01-23 12:37:12 -05:00
Nick Mathewson
54c9c8b04f
If address/get_if_addrs6 can't findipv6, log WARN, not ERR
...
Fixes 29160, and allows 28668 (treating ERR logs as test failures)
to procede.
2019-01-23 12:04:57 -05:00
Nick Mathewson
adeeb8841e
Merge branch 'maint-0.3.5'
2019-01-23 11:18:14 -05:00
rl1987
712a622fce
Log an HSDesc we failed to parse at Debug loglevel
2019-01-23 10:37:10 -05:00
Nick Mathewson
dd6c2b0ad7
maint-0.2.9: remove changes files that are merged in 0.2.9 releases
...
Many of these files cause check-changes to fail, which will be a
long-term problem as we continue to support 0.2.9.
2019-01-23 09:48:28 -05:00
Nick Mathewson
8e1e71cc0d
Merge branch 'bug29122'
2019-01-22 14:31:01 -05:00
George Kadianakis
6243133a71
Fix intermittent failures of test_circuitpadding_wronghop().
...
We fix it by disabling the scheduling of actual padding.
Fixes #29122 .
2019-01-22 14:30:43 -05:00
Nick Mathewson
74e41155ff
Merge branch 'maint-0.3.5'
2019-01-22 12:27:50 -05:00
Nick Mathewson
d9fde87607
correct bug number in 29042 changelog
2019-01-22 12:27:46 -05:00
Nick Mathewson
21dd3ece62
Merge branch 'maint-0.3.5'
2019-01-22 11:55:56 -05:00
Nick Mathewson
4159d103d6
Merge branch 'bug29042_035' into maint-0.3.5
2019-01-22 11:55:53 -05:00
Nick Mathewson
00bc18b847
Merge remote-tracking branch 'tor-github/pr/653'
2019-01-22 08:13:14 -05:00
Nick Mathewson
0ce4d23af5
Merge branch 'maint-0.3.5'
2019-01-22 08:04:55 -05:00
Nick Mathewson
9ce1978b5e
Merge branch 'bug28979_035' into maint-0.3.5
2019-01-22 08:04:52 -05:00
Nick Mathewson
761f1bf71e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-18 12:25:08 -05:00
Nick Mathewson
4cca7fb99b
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-18 12:25:08 -05:00
Nick Mathewson
d1af4d65df
Merge branch 'maint-0.3.5'
2019-01-18 12:25:08 -05:00
Nick Mathewson
a8580a6836
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-18 12:25:08 -05:00
Nick Mathewson
7c6a8c674b
Fix documentation for ClientAuth on HSv3.
...
The manpage erroneously said "privkey" when "public-key" would have
been correct. Reported by "Felixix" as ticket 28979. Bugfix on
0.3.5.1-alpha.
2019-01-16 16:10:20 -05:00
Nick Mathewson
3baf99e81b
Merge branch 'ticket28668_035' into ticket28668_040
2019-01-16 15:54:31 -05:00
Nick Mathewson
f684cd8005
Fail any unit test that causes an unhandled LD_BUG or LOG_ERR
...
Closes ticket 28668.
2019-01-16 15:47:33 -05:00
Nick Mathewson
16430fdaf5
Merge branch 'maint-0.3.5'
2019-01-16 14:43:53 -05:00
Kris Katterjohn
f0408b844f
Add changes file for bug 28981
...
The fix was in commit 61636ad989de674698601284957dacde53cc4984.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-01-16 14:40:31 -05:00
Nick Mathewson
0981ac4c59
Log more messages when failing to decode RSA keys
...
We log these messages at INFO level, except when we are reading a
private key from a file, in which case we log at WARN.
This fixes a regression from when we re-wrote our PEM code to be
generic between nss and openssl.
Fixes bug 29042, bugfix on 0.3.5.1-alpha.
2019-01-16 14:35:30 -05:00
Nick Mathewson
49062d72b5
Start on 0.4.0.1-alpha changelog
2019-01-16 08:28:07 -05:00
Nick Mathewson
139202174b
Remove changes entries that appeared in 0.3.5.7
2019-01-16 08:20:12 -05:00
Nick Mathewson
2dd23086f1
Remove fallback scripts and whitelist
...
They have been extracted to a new fallback-scripts.git repository.
Closes ticket 27914.
2019-01-15 19:20:25 -05:00
Mike Perry
6440fdb8de
Changes file for Ticket 28142.
2019-01-15 22:53:03 +00:00
Nick Mathewson
9a61d3f5ad
Merge branch 'bug24953_squashed'
2019-01-15 08:25:35 -05:00
rl1987
7fbe7a2563
In updateFallbackDirs.py, say 'fallback list' instead of 'whitelist'
2019-01-15 08:25:29 -05:00
Nick Mathewson
c281e587bb
Merge branch 'ticket28058_squashed'
2019-01-15 08:08:41 -05:00
rl1987
30a925fe96
Add changes file
2019-01-15 08:08:29 -05:00
Nick Mathewson
691dec5d46
Merge branch 'maint-0.3.5'
2019-01-14 14:02:42 -05:00
rl1987
9d9e71824c
Rework rep_hist_log_link_protocol_counts()
2019-01-14 14:01:55 -05:00
Nick Mathewson
cef910642e
Merge branch 'bug28989_squashed'
2019-01-11 18:56:57 -05:00
rl1987
1bcececdd8
Fix CID 1442277
2019-01-11 18:56:48 -05:00
Nick Mathewson
d21fa48cac
Merge branch 'maint-0.3.5'
2019-01-11 18:53:24 -05:00
Nick Mathewson
efd765a948
Merge remote-tracking branch 'tor-github/pr/563' into maint-0.3.5
2019-01-11 18:53:18 -05:00
teor
89a0b77740
rend: stop warning when clients send multiple rend establish cells
...
Stop logging "Tried to establish rendezvous on non-OR circuit..." as
a warning. Instead, log it as a protocol warning, because there is
nothing that relay operators can do to fix it.
Fixes bug 29029; bugfix on 0.2.5.7-rc.
2019-01-10 07:59:59 +10:00
Nick Mathewson
2f0e187191
Merge remote-tracking branch 'tor-github/pr/627'
2019-01-09 15:46:14 -05:00
Nick Mathewson
578a93bbbc
Merge branch 'ticket28843'
2019-01-09 09:49:25 -05:00
Nick Mathewson
0ed966fde1
Merge branch 'maint-0.3.5'
2019-01-09 09:38:27 -05:00
Nick Mathewson
694e3c57fd
Merge remote-tracking branch 'tor-github/pr/636' into maint-0.3.5
2019-01-09 09:38:22 -05:00
Nick Mathewson
d890ec29aa
Merge branch 'maint-0.3.5'
2019-01-09 09:35:40 -05:00
rl1987
380ae2b74b
Stop logging 'Your Guard' in circpathbias.c
2019-01-09 09:35:36 -05:00
Nick Mathewson
3df1d29d9b
Merge branch 'bug28591_035_squashed'
2019-01-09 09:33:31 -05:00
teor
44db455cc8
Dir: allow directory mirrors to serve future consensuses
...
When Tor's clock is behind the clocks on the authorities, allow Tor to
serve future consensuses.
Fixes bug 28654; bugfix on 0.3.0.1-alpha.
2019-01-09 09:32:28 -05:00
Nick Mathewson
e6a4401200
Merge branch 'maint-0.3.5'
2019-01-09 08:52:10 -05:00
Kris Katterjohn
09472791d0
Add changes file for bug 28938
...
The fix was in commit 30b84adb5f0b6e56d0fb82c374e3cb44089f64d0.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-01-09 08:52:05 -05:00
Nick Mathewson
a891d81c5f
Changes file for 28856
2019-01-09 08:48:11 -05:00
teor
85c598cbc2
stats: Make PaddingStatistics depend on ExtraInfoStatistics
...
When ExtraInfoStatistics is 0, stop including PaddingStatistics in
relay and bridge extra-info documents.
Fixes bug 29017; bugfix on 0.3.1.1-alpha.
2019-01-08 18:21:10 +10:00
Kris Katterjohn
c59b572e93
Fix tor_ersatz_socketpair on IPv6-only systems
...
In get_local_listener used by tor_ersatz_socketpair, the address
family used when binding the IPv6 socket was AF_INET instead of
AF_INET6.
Fixes bug 28995; bugfix on 0.3.5.1-alpha.
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-01-07 17:28:21 -06:00
Nick Mathewson
0402746a99
Merge remote-tracking branch 'rl1987/doc28805'
2019-01-07 08:51:37 -05:00
Nick Mathewson
85c5f58509
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-07 08:43:46 -05:00
Nick Mathewson
fe26e1f1c8
Merge branch 'maint-0.3.5'
2019-01-07 08:43:46 -05:00
Nick Mathewson
3d18903f53
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-07 08:43:45 -05:00
Nick Mathewson
ba71b17865
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-01-07 08:43:45 -05:00
Karsten Loesing
445d6750f7
Update geoip and geoip6 to the January 3 2019 database.
2019-01-07 09:00:29 +01:00
Nick Mathewson
73de7b4bcb
Merge branch 'bug21394_029_redux' into maint-0.2.9
2019-01-04 15:04:54 -05:00
Nick Mathewson
af85a0f28f
Remove from master those changes files that will appear in 0.3.5.7 or earlier.
2019-01-04 15:04:00 -05:00
Nick Mathewson
fe3331b845
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-04 14:57:06 -05:00
Nick Mathewson
bf8bb9c526
Merge remote-tracking branch 'dgoulet/ticket28619_033_01' into maint-0.3.3
2019-01-04 14:49:16 -05:00
Nick Mathewson
d47c9276de
Merge branch 'ticket27750_034_01_squashed' into maint-0.3.4
2019-01-04 14:34:38 -05:00
Nick Mathewson
98a1b8770c
Merge branch 'maint-0.3.5'
2019-01-03 21:34:43 -05:00
Nick Mathewson
c75cf802d3
Merge branch 'ticket28879' into maint-0.3.5
2019-01-03 21:34:35 -05:00
Nick Mathewson
a7cbbf279e
Merge branch 'ticket28852'
2019-01-03 21:31:08 -05:00
Nick Mathewson
9ba690e33f
Merge branch 'maint-0.3.5'
2019-01-03 09:45:56 -05:00
Nick Mathewson
abdc6aede2
Merge branch 'ticket28851_035_squashed' into maint-0.3.5
2019-01-03 09:45:53 -05:00
Nick Mathewson
b82717b273
Stop re-checking our hardcoded dh parameters on every startup
...
Closes ticket 28851.
2019-01-03 09:45:43 -05:00
Nick Mathewson
47176eb678
Merge branch 'maint-0.3.5'
2019-01-03 09:44:15 -05:00
Nick Mathewson
98736cf36a
Merge remote-tracking branch 'public/ticket28838_035' into maint-0.3.5
2019-01-03 09:44:10 -05:00
Nick Mathewson
27853938a1
Merge branch 'maint-0.3.5'
2019-01-03 09:02:40 -05:00
Nick Mathewson
3e64553f76
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-01-03 09:02:39 -05:00
Nick Mathewson
ed62f0fa15
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-01-03 09:02:39 -05:00
Nick Mathewson
bf413829cb
Detect openssl bug 7712 and work around it.
...
In theory it would be better to detect this bug in advance, but this
approach is much simpler, and therefore safer to backport.
This closes tor issue 28973.
2019-01-03 09:00:47 -05:00
rl1987
dbf1725a13
Completely remove 'GETINFO status/version/num-{concurring,versioning}'
2019-01-03 10:36:38 +02:00
Nick Mathewson
3e7f13a4ef
Merge branch 'maint-0.3.5'
2019-01-02 16:15:39 -05:00
Nick Mathewson
98755cbddf
Merge branch 'bug28974_035' into maint-0.3.5
2019-01-02 16:15:34 -05:00
Nick Mathewson
eaaeaf7933
Merge branch 'maint-0.3.5'
2019-01-02 16:09:20 -05:00
Nick Mathewson
a4b86421d2
ticket 28924 deserves a changes file. I made one, but I guess I forgot to git add
2019-01-02 16:09:10 -05:00
Nick Mathewson
b33bcb1e63
Add an errno.h include to freespace.c to fix bug 28974.
2019-01-02 15:19:52 -05:00
rl1987
8eadfad71d
Tweak ControlPort description in manpage
2018-12-23 19:58:25 +02:00
Nick Mathewson
99713b176b
Merge branch 'maint-0.3.5'
2018-12-21 15:42:58 -05:00
Nick Mathewson
a9eec33649
Merge branch 'maint-0.3.4' into maint-0.3.5
2018-12-21 15:42:57 -05:00
Nick Mathewson
70dd6d07bb
Merge branch 'orconn-tracker_squashed'
2018-12-21 14:22:11 -05:00
Taylor Yu
2100b35f07
changes file for ticket27167
2018-12-21 14:15:35 -05:00
Nick Mathewson
ab4395d082
Merge branch 'ticket28847'
2018-12-21 13:26:47 -05:00
Alexander Færøy
cf4b3dbd44
Use the subsystem list to initialize and shutdown process module.
...
This patch makes the process module use the subsystem list for
initializing and shutting down.
See: https://bugs.torproject.org/28847
2018-12-21 13:26:38 -05:00
David Goulet
2420e84ba4
mainloop: Reactivate the linked connection event with a non empty list
...
Linked connections aren't woken up by libevent due to I/O but rather
artificially so we can, by chunks, empty the spooled object(s).
Commit 5719dfb48f
(in 0.3.4.1-alpha) made it
that the schedule_active_linked_connections_event would be only called once at
startup but this is wrong because then we would never go through again the
active linked connections.
Fortunately, everytime a new linked connection is created, the event is
activated and thus we would go through the active list again. On a busy relay,
this issue is mitigated by that but on a slower relays or bridge, a connection
could get stuck for a while until a new directory information request would
show up.
Fixes #28717 , #28912
2018-12-21 11:25:23 -05:00
Nick Mathewson
e4109020e9
Merge remote-tracking branch 'tor-github/pr/609'
2018-12-20 16:42:35 -05:00
Nick Mathewson
0e6e902cbc
Merge branch 'document_--version'
2018-12-20 11:50:48 -05:00
Nick Mathewson
973a5db808
Merge remote-tracking branch 'tor-github/pr/445'
2018-12-20 07:53:57 -05:00
Nick Mathewson
9c6283732a
Merge branch 'maint-0.3.5'
2018-12-20 07:50:04 -05:00
Nick Mathewson
ef97543270
Merge remote-tracking branch 'tor-github/pr/607' into maint-0.3.5
2018-12-20 07:49:59 -05:00
Alexander Færøy
e2c36b9ca0
Add and update changes files for #28846 .
...
This ticket finishes the implementatoin of #28180 and adds the new
STATUS message from #28846 .
See: https://bugs.torproject.org/28846
2018-12-20 04:08:04 +01:00
teor
02009c66c0
Stop running stem's unit tests as part of "make test-stem"
...
But continue to run stem's unit and online tests during
"make test-stem-full".
Fixes bug 28568; bugfix on 0.2.6.3-alpha.
2018-12-20 13:01:18 +10:00
Nick Mathewson
1c47459e5a
Merge branch 'maint-0.3.5'
2018-12-19 15:36:08 -05:00
Nick Mathewson
b7018b1a24
Merge branch 'ticket28883_035' into maint-0.3.5
2018-12-19 15:36:03 -05:00
Nick Mathewson
ed0bc85ed0
Merge branch 'ticket28853'
2018-12-18 18:59:56 -05:00
Nick Mathewson
bb091da1e7
Merge branch 'ticket28839_v2_squashed'
2018-12-18 18:59:05 -05:00
Nick Mathewson
976c62e62a
Changes file for ticket28839
2018-12-18 18:58:08 -05:00
Nick Mathewson
372df7a630
Merge branch 'maint-0.3.5'
2018-12-18 13:56:22 -05:00
Nick Mathewson
26bbeb298d
Merge branch 'bug28612_squashed' into maint-0.3.5
2018-12-18 13:55:57 -05:00
Nick Mathewson
1c2abea30a
Call run_tor_main_loop() in ntmain.c, rather than do_main_loop().
...
Fixes bug 28612; bugfix on 0.3.5.3-alpha.
2018-12-18 13:55:08 -05:00
Nick Mathewson
0af0f78dff
Merge branch 'maint-0.3.5'
2018-12-18 13:52:39 -05:00
Nick Mathewson
702fd6f0f2
Merge branch 'ticket28881_035' into maint-0.3.5
2018-12-18 13:52:36 -05:00
Nick Mathewson
4894d44ab8
Always initialize addr in parse_port_config()
...
It was always analyzed before use, but scan-build wasn't able to
persuade itself of that.
Closes ticket 28881.
2018-12-18 13:52:25 -05:00
Nick Mathewson
a3e6f2467b
Merge remote-tracking branch 'tor-github/pr/595'
2018-12-18 13:51:21 -05:00
Nick Mathewson
872998dd00
Merge branch 'ticket28179_squashed_merged'
2018-12-18 13:36:34 -05:00
Alexander Færøy
44a80bb361
Add missing changes files for #26360 , #28179 , #28180 .
...
See: https://bugs.torproject.org/26179
See: https://bugs.torproject.org/28180
See: https://bugs.torproject.org/28360
2018-12-18 13:36:08 -05:00
Nick Mathewson
90187b1bfc
Remove changes that are already merged in 0.3.5.x releases
2018-12-18 08:15:38 -05:00
Nick Mathewson
c61cd5775c
Revert "Log bootstrap tag names"
...
This reverts commit 1b855af5e3
.
2018-12-18 08:09:43 -05:00
Nick Mathewson
508837b62b
Document the output of --version
...
Closes 28889
2018-12-17 17:54:01 -05:00
Nick Mathewson
5a22b42c3a
Merge branch 'maint-0.3.5'
2018-12-17 10:57:51 -05:00