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
31,736 Commits 53 Branches 631 Tags
938d97cb0d4acfdd1ea57ec0a3094bcc2101f13d
Commit Graph

31736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 938d97cb0d Merge branch 'maint-0.4.0' 
Ours to avoid version bump.
 2019-03-21 09:36:40 -04:00
Nick Mathewson ebc7556dd0 Bump version to 0.4.0.3-alpha 2019-03-21 09:36:19 -04:00
teor ca26567044 Merge branch 'maint-0.4.0' 2019-03-20 09:48:21 +10:00
teor 3871fb732d Merge branch 'maint-0.3.5' into maint-0.4.0 2019-03-20 09:48:12 +10: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
Nick Mathewson 2a49b27b9f Merge remote-tracking branch 'tor-github/pr/781' 2019-03-19 10:22:31 -04:00
Nick Mathewson a80131765a Merge branch 'maint-0.4.0' 2019-03-19 09:32:24 -04:00
Nick Mathewson de5ab1ef49 Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0 2019-03-19 09:32:05 -04:00
teor 4c22c11136 Merge branch 'maint-0.4.0' 2019-03-19 15:43:42 +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 af21d126e6 Merge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_merge 
Comment merge.
 2019-03-18 11:30:37 +10:00
teor 55865a2c9c Merge branch 'bug29706_034_minimal_merge' into bug29706_035_minimal_merge 2019-03-18 11:29:20 +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
George Kadianakis 0aaeec19e7 Satisfy practracker broken by #29665 and #28656. 2019-03-15 17:13:06 +02:00
Nick Mathewson 677384e276 Merge branch 'maint-0.4.0' 2019-03-15 08:59:30 -04: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 1cffacdaf5 Merge branch 'maint-0.4.0' 2019-03-15 08:54:39 -04:00
Nick Mathewson 560ba98dd7 Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0 2019-03-15 08:54:30 -04:00
Nick Mathewson af56dece09 Merge branch 'maint-0.4.0' 2019-03-15 08:53:03 -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
David Goulet aee65084b4 circ: Remove n_mux and p_mux members 
They are simply not used apart from assigning a pointer and asserting on the
pointer depending on the cell direction.

Closes #29196.

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-03-14 23:54:05 -04:00
Nick Mathewson 2d76945052 practracker: Create an exception for an as-yet-nonexistent file. 
We need a better way to do this.
 2019-03-14 09:35:23 -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
George Kadianakis a55c89c475 practracker: Be compatible with python2 which is used by travis/jenkins. 2019-03-14 02:15:32 +02:00
teor de61669425 Merge branch 'maint-0.4.0' 2019-03-14 07:00:51 +10:00
teor feb7253df3 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-03-14 07:00:43 +10: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
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
Nick Mathewson cab93930de Merge branch 'pr_722_squashed' 2019-03-13 10:37:37 -04:00
George Kadianakis 8b64ff7a3f Silence unneeded clang warns that triggered in prob distr tests. 
See https://trac.torproject.org/projects/tor/ticket/29528#comment:3
and https://bugs.llvm.org/show_bug.cgi?id=19535
 2019-03-13 10:36:26 -04:00
George Kadianakis a71999462b Fix test prob distr parameters that caused warnings. 
They were causing the following warnings in circuitpadding/circuitpadding_sample_distribution:

     src/lib/math/prob_distr.c:1311:17: runtime error: division by zero
     SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior src/lib/math/prob_distr.c:1311:17 in
     src/lib/math/prob_distr.c:1219:49: runtime error: division by zero
     SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior src/lib/math/prob_distr.c:1219:49 in

because the distributions were called with erroneous parameters (e.g. geometric
distribution with p=0).

We now defined these test probability distributions with more realistic
parameters.

As far as the circuitpadding_sample_distribution() test is concerned, it
doesn't matter if the distributions return values outside of [0,10] since we
already restrict the values into that interval using min=0 and max=10 (and RTT
estimate is disabled).
 2019-03-13 10:36:26 -04:00
George Kadianakis 26b0d95397 Merge branch 'tor-github/pr/780' 2019-03-13 16:07:19 +02:00
Nick Mathewson 58fd864a85 Merge remote-tracking branch 'tor-github/pr/705' 2019-03-13 09:36:47 -04:00