torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
30,851 Commits 53 Branches 631 Tags
acec0192c3d6400316037cdc3e4c9093c1919252
Commit Graph

30851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rl1987 acec0192c3 Add changes file 2019-04-10 18:45:36 +10:00
rl1987 93dcfc6593 Use empty torrc file when launching tor in test_rebind.py 2019-04-10 18:45:21 +10:00
teor 3b9e3cca94 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-04-06 09:33:20 +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
teor db71bceb40 Merge branch 'bug29036-29962-034' into bug29036-29962-035 2019-04-05 12:58:32 +10:00
teor a514e02476 Merge branch 'bug29036-029' into bug29036-29962-034 2019-04-05 12:58:16 +10:00
teor f0cd8f804f Makefile: actually, don't delete the gcno files 
We need to keep the gcno files, because they are created at compile time.
 2019-04-05 12:56:29 +10: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 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 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 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
teor 33be8d8295 Travis: merge before_cache from 29036 and 29962 
And add some useful comments
 2019-04-01 14:08:34 +10:00
rl1987 124990aa01 Add changes file 2019-04-01 14:08:24 +10:00
rl1987 0c6cfd9c65 Cleanup cargo registry before each Rust-enabled build 
Also, refrain from caching target/.

See: https://levans.fr/rust_travis_cache.html
 2019-04-01 14:08:12 +10:00
teor ac28e56ccb Merge branch 'bug29036-029' into bug29036-29962-034 2019-04-01 14:07:58 +10:00
teor 57e9fe2bba Makefile: delete all the gcov-related files in reset-gcov 
And fix a comment.

See:
https://gcc.gnu.org/onlinedocs/gcc/Gcov-Data-Files.html#Gcov-Data-Files
 2019-04-01 14:06:52 +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 3280e9a116 Merge branch 'maint-0.3.4' into maint-0.3.5 2019-03-27 10:02:40 +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 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 091f8688b8 test/dir: add an extra argument to dirserv_read_measured_bandwidths() 
Part of 29806.
 2019-03-21 12:56:28 +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 fbb1c7adfc Handle errors from coveralls more gracefully. 
Since we have moved coveralls to the script target the entire build will
now fail if coveralls fail. We handle it more gracefully by echo'ing the
failure instead of doing a hard-failure.

See: https://bugs.torproject.org/29036
 2019-03-20 15:44:06 +01: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 41cd05562f Merge branch 'maint-0.3.4' into maint-0.3.5 2019-03-20 09:48:03 +10:00
teor d7a5fdcb74 Merge branch 'maint-0.2.9' into maint-0.3.4 2019-03-20 09:47:55 +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 17e3eea685 Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5 2019-03-19 15:43:05 +10:00
teor aec6ee201b test/sr: update sr_state_free() to sr_state_free_all() in a comment 2019-03-18 11:28:34 +10:00
teor 1d0146e2a2 Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge 2019-03-18 11:27:59 +10:00
teor c44ad396f8 test/sr: Clear SRVs after init, and before setup 
Already merged to 0.4.0 and later in tor-github/pr/776.
Backported to 0.2.9 and later with minor comment changes.

Part of 29706.
 2019-03-18 11:12:25 +10: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
teor 5d41e2223f Merge branch 'maint-0.3.4' into maint-0.3.5 
"ours" merge to ignore the changes to src/common/compat.c,
they have already been merged to 0.3.5 in the correct file.
 2019-03-14 06:59:09 +10: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