George Kadianakis
d11976b8bd
Merge branch 'tor-github/pr/709'
2019-03-26 15:34:54 +02:00
George Kadianakis
2790ee3685
Merge branch 'maint-0.4.0'
2019-03-26 15:16:37 +02:00
George Kadianakis
06951cb3fc
Merge branch 'tor-github/pr/847' into maint-0.4.0
2019-03-26 15:16:21 +02:00
teor
613c5ff357
Merge remote-tracking branch 'tor-github/pr/724'
2019-03-26 19:31:17 +10:00
teor
0642650865
Merge branch 'maint-0.4.0'
2019-03-26 19:16:06 +10: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
3d38d0ca24
Merge branch 'maint-0.4.0'
2019-03-26 16:57:04 +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
teor
d482913e69
Merge remote-tracking branch 'tor-github/pr/834'
2019-03-26 12:55:48 +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
teor
d4d541c53c
Merge remote-tracking branch 'tor-github/pr/785'
2019-03-25 14:01:20 +10:00
rl1987
f09205ef53
Refactor test_utils_general() to fix Coverity warnings
2019-03-24 10:10:52 +02:00
rl1987
9529d99982
Tweak changes file
2019-03-24 09:25:30 +02:00
Nick Mathewson
22e72eeaa7
Merge branch 'maint-0.4.0'
2019-03-22 11:17:10 -04:00
George Kadianakis
a5df9402b6
prob-distr: Decrease false positive rate of stochastic tests.
2019-03-22 11:16:30 -04:00
teor
15900ab70f
Merge remote-tracking branch 'tor-github/pr/819'
2019-03-22 13:10:47 +10:00
George Kadianakis
846d379b50
circpad/prob_distr: Use crypto_fast_rng() instead of the old RNG.
2019-03-22 09:22:54 +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
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
Nick Mathewson
2a49b27b9f
Merge remote-tracking branch 'tor-github/pr/781'
2019-03-19 10:22:31 -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
1d0146e2a2
Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
2019-03-18 11:27:59 +10: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
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
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
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
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
Nick Mathewson
17ff69a268
Merge branch 'bug29221_more_squashed'
2019-03-13 09:30:02 -04:00
Nick Mathewson
504aef6228
Changes file for practracker (29221)
2019-03-13 09:29:10 -04:00
Nick Mathewson
95209be861
Make checkSpace.pl check guard macros:
...
- every .h file needs an #ifndef/#define pair.
- They must refer to the same macro.
- The guard macros that they refer to must be unique across all headers.
2019-03-12 15:19:28 -04:00
