a47b61f329
Merge branch 'messaging_v3' into messaging_v3_merged
2019-03-26 20:13:49 -04:00
3767eff9bb
changes file for pubsub code
2019-03-26 20:10:56 -04:00
c72526f168
Merge branch 'maint-0.4.0'
2019-03-27 09:36:55 +10:00
9ae8d663ea
Merge remote-tracking branch 'tor-github/pr/836' into maint-0.4.0
2019-03-27 09:36:26 +10:00
989b6325d6
Merge branch 'tor-github/pr/842'
2019-03-26 16:41:07 +02:00
f32d890531
Merge branch 'bug29805_rebased_squashed'
2019-03-26 09:39:46 -04:00
08176c2396
prob-distr: Silence some coverity warnings.
2019-03-26 09:39:37 -04:00
d11976b8bd
Merge branch 'tor-github/pr/709'
2019-03-26 15:34:54 +02:00
2790ee3685
Merge branch 'maint-0.4.0'
2019-03-26 15:16:37 +02:00
06951cb3fc
Merge branch 'tor-github/pr/847' into maint-0.4.0
2019-03-26 15:16:21 +02:00
613c5ff357
Merge remote-tracking branch 'tor-github/pr/724'
2019-03-26 19:31:17 +10:00
0642650865
Merge branch 'maint-0.4.0'
2019-03-26 19:16:06 +10:00
4258728d56
Merge remote-tracking branch 'tor-github/pr/852' into maint-0.4.0
2019-03-26 19:15:46 +10:00
6ecf9590ea
changes: add file for #21377
2019-03-26 17:41:21 +10:00
3d38d0ca24
Merge branch 'maint-0.4.0'
2019-03-26 16:57:04 +10:00
828033001b
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.4.0
2019-03-26 16:56:45 +10:00
d482913e69
Merge remote-tracking branch 'tor-github/pr/834'
2019-03-26 12:55:48 +10:00
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
b76ae3898d
Merge branch 'ticket29806_035_squashed_merged' into ticket29806_040_squashed_merged
2019-03-26 11:48:52 +10:00
b71febcea8
changes file for control.c splitup
2019-03-25 15:08:36 -04:00
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
d4d541c53c
Merge remote-tracking branch 'tor-github/pr/785'
2019-03-25 14:01:20 +10:00
f09205ef53
Refactor test_utils_general() to fix Coverity warnings
2019-03-24 10:10:52 +02:00
9529d99982
Tweak changes file
2019-03-24 09:25:30 +02:00
22e72eeaa7
Merge branch 'maint-0.4.0'
2019-03-22 11:17:10 -04:00
a5df9402b6
prob-distr: Decrease false positive rate of stochastic tests.
2019-03-22 11:16:30 -04:00
15900ab70f
Merge remote-tracking branch 'tor-github/pr/819'
2019-03-22 13:10:47 +10:00
846d379b50
circpad/prob_distr: Use crypto_fast_rng() instead of the old RNG.
2019-03-22 09:22:54 +10:00
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
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
41cd05562f
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-20 09:48:03 +10:00
6bf9078ceb
Merge remote-tracking branch 'tor-github/pr/798' into maint-0.3.5
2019-03-20 09:47:31 +10:00
2a49b27b9f
Merge remote-tracking branch 'tor-github/pr/781'
2019-03-19 10:22:31 -04:00
4c22c11136
Merge branch 'maint-0.4.0'
2019-03-19 15:43:42 +10:00
b4483edce0
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-19 15:43:33 +10:00
17e3eea685
Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5
2019-03-19 15:43:05 +10:00
1d0146e2a2
Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
2019-03-18 11:27:59 +10:00
677384e276
Merge branch 'maint-0.4.0'
2019-03-15 08:59:30 -04:00
1547fd99a6
Merge branch 'bug28656_035_squashed' into maint-0.4.0
2019-03-15 08:59:19 -04:00
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
af56dece09
Merge branch 'maint-0.4.0'
2019-03-15 08:53:03 -04:00
94523bffdc
Merge remote-tracking branch 'tor-github/pr/791' into maint-0.4.0
2019-03-15 08:52:50 -04:00
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
e021f89f36
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-03-14 06:56:38 +10:00
f3b17a6b26
Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4
2019-03-14 06:56:09 +10:00
c03b1b3f08
Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4
2019-03-14 06:55:57 +10:00
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
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
5606cfae47
Merge remote-tracking branch 'tor-github/pr/771' into maint-0.3.4
2019-03-14 06:41:14 +10:00
8bd9b2a6a0
Merge remote-tracking branch 'tor-github/pr/770' into maint-0.2.9
2019-03-14 06:37:50 +10:00
Nick Mathewson
teor
George Kadianakis
juga0
rl1987
Taylor Yu
Roger Dingledine