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
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
Roger Dingledine
add0f89c14
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:53:33 +02: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
teor
9400da9b5e
test/sr: Free SRVs before replacing them in test_sr_setup_srv()
...
Stop leaking parts of the shared random state in the shared-random unit
tests. The previous fix in 29599 was incomplete.
Fixes bug 29706; bugfix on 0.2.9.1-alpha.
2019-03-09 11:59:52 +10:00
David Goulet
b4e44a371f
hs-v2: Copy needed information between service on prunning
...
Turns out that when reloading a tor configured with hidden service(s), we
weren't copying all the needed information between the old service object to
the new one.
For instance, the desc_is_dirty timestamp wasn't which could lead to the
service uploading its descriptor much later than it would need to.
The replaycache wasn't also moved over and some intro point information as
well.
Fixes #23790
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-03-08 09:59:04 -05:00
teor
e91b999cf2
Merge branch 'bug23512-v4-029-fixes-keep-typedef' into bug23512-v4-034-fixes
2019-03-08 19:37:18 +10:00
teor
ffd7207025
Merge remote-tracking branch 'tor-github/pr/733' into maint-0.3.5
2019-03-08 14:11:14 +10:00
teor
08ddf1f62b
Merge remote-tracking branch 'bug28525_029' into maint-0.3.5
2019-03-08 12:33:00 +10:00
Neel Chauhan
63b4049114
Make tor_addr_is_internal_() RFC6598 (Carrier Grade NAT) aware
...
Fixes 28525.
2019-03-08 12:19:12 +10:00
Nick Mathewson
d6f77b99da
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-06 14:29:38 -05:00
Nick Mathewson
155b0f5521
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-03-06 14:29:33 -05:00
Nick Mathewson
0c9cd7c487
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-03-06 14:29:29 -05:00
Karsten Loesing
2e74edb53e
Update geoip and geoip6 to the March 4 2019 database.
2019-03-06 11:45:27 +01:00
teor
1c248fa27d
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-01 14:16:59 +10:00
teor
f56645917e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-03-01 14:16:22 +10:00
teor
76b55fde81
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-03-01 14:15:59 +10:00
teor
7786198eef
Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
2019-03-01 14:15:00 +10:00
teor
c1ab538479
Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9
2019-03-01 14:14:51 +10:00
teor
ecbc2e80a0
Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9
2019-03-01 14:14:26 +10:00
Mike Perry
e8d84b18aa
Bug 25733: Avoid assert failure if all circuits time out.
...
Prior to #23100 , we were not counting HS circuit build times in our
calculation of the timeout. This could lead to a condition where our timeout
was set too low, based on non HS circuit build times, and then we would
abandon all HS circuits, storing no valid timeouts in the histogram.
This commit avoids the assert.
2019-03-01 13:48:01 +10:00
Kris Katterjohn
389ee834b6
Log the correct "auto" port number for listening sockets
...
When "auto" was used for the port number for a listening socket, the
message logged after opening the socket would incorrectly say port 0
instead of the actual port used.
Fixes bug 29144; bugfix on 0.3.5.1-alpha
Signed-off-by: Kris Katterjohn <katterjohn@gmail.com>
2019-03-01 12:34:21 +10:00
teor
9b7cdd23de
doc: update the man page and sample torrc for ExitRelay
...
We changed the default of ExitRelay in #21530 in 0.3.5.1-alpha, but
forgot to update the documentation.
Closes 29612.
2019-02-28 11:22:20 +10:00
teor
de0969ef78
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:49:33 +10:00
teor
6a61a020ee
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-28 10:49:19 +10:00
teor
be71cce9f8
Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3
2019-02-28 10:48:46 +10:00
teor
be29dfedd9
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:45:59 +10:00
teor
524731503e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-28 10:45:44 +10:00
teor
3313444ef0
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-28 10:45:30 +10:00
teor
78bfe731c3
appveyor: Do the 64-bit Windows Server 2016 job first
2019-02-28 07:44:15 +10:00
