2cdb691034
Light editing on the 0.4.0.3-alpha changelog
2019-03-22 08:46:07 -04:00
2ee184bacc
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-21 09:36:55 -04:00
ebc7556dd0
Bump version to 0.4.0.3-alpha
2019-03-21 09:36:19 -04:00
744ba41ed0
Start a changelog for 0.4.0.3-alpha
2019-03-21 09:33:57 -04:00
53f204bfe0
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-20 09:48:17 +10:00
3871fb732d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-20 09:48:12 +10:00
41cd05562f
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-20 09:48:03 +10:00
d7a5fdcb74
Merge branch 'maint-0.2.9' into maint-0.3.4
2019-03-20 09:47:55 +10:00
6bf9078ceb
Merge remote-tracking branch 'tor-github/pr/798' into maint-0.3.5
2019-03-20 09:47:31 +10:00
db2ac3b9fe
Merge remote-tracking branch 'tor-github/pr/774' into maint-0.2.9
2019-03-20 09:46:10 +10:00
544a613556
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-19 09:32:24 -04:00
de5ab1ef49
Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0
2019-03-19 09:32:05 -04:00
fcf8c1143b
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-19 15:43:38 +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
af21d126e6
Merge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_merge
...
Comment merge.
2019-03-18 11:30:37 +10:00
55865a2c9c
Merge branch 'bug29706_034_minimal_merge' into bug29706_035_minimal_merge
2019-03-18 11:29:20 +10:00
aec6ee201b
test/sr: update sr_state_free() to sr_state_free_all() in a comment
2019-03-18 11:28:34 +10:00
1d0146e2a2
Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
2019-03-18 11:27:59 +10:00
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
dfb8f0feeb
Merge branch 'maint-0.4.0' into release-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
aed893798f
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-15 08:54:39 -04:00
560ba98dd7
Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
2019-03-15 08:54:30 -04:00
0fced1949a
Merge branch 'maint-0.4.0' into release-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
609b72fde3
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-14 07:00:47 +10:00
feb7253df3
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-14 07:00:43 +10:00
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
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
90301247fd
Merge remote-tracking branch 'tor-github/pr/765' into maint-0.2.9
2019-03-14 06:37:17 +10:00
530304dd77
Merge remote-tracking branch 'tor-github/pr/746' into maint-0.2.9
2019-03-14 06:36:47 +10:00
eaa84234c9
Merge remote-tracking branch 'tor-github/pr/510' into maint-0.2.9
2019-03-14 06:36:11 +10:00
9daae1b302
Merge remote-tracking branch 'tor-github/pr/331' into maint-0.2.9
2019-03-14 06:35:05 +10:00
a9c3101e21
test/sr: Clear SRVs after init, and before setup
...
Part of 29706.
2019-03-13 15:29:46 +10:00
ea84d62bc2
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-12 14:22:08 -04:00
ec2a2a6b7a
Fix #28525 changes file that is breaking CI.
2019-03-12 20:11:51 +02:00
ab34f49be9
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-12 18:11:53 +02:00
0ce32affc2
Merge branch 'tor-github/pr/763' into maint-0.4.0
2019-03-12 18:11:35 +02:00
feda2231a2
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-12 11:03:47 -04:00
9c9214f2c9
Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
2019-03-12 11:03:37 -04:00
dfc3e552a3
test/sr: update sr_state_free() to sr_state_free_all()
...
The function name changed between 0.2.9 and 0.3.4.
2019-03-12 11:34:52 +10:00
Nick Mathewson
teor
Roger Dingledine
George Kadianakis