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,579 Commits 53 Branches 631 Tags
744ba41ed0763d119ca4bcc66a7962d0bf1a618c
Commit Graph

23353 Commits

Author SHA1 Message Date
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
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 560ba98dd7 Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0 2019-03-15 08:54:30 -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 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 a9c3101e21 test/sr: Clear SRVs after init, and before setup 
Part of 29706.
 2019-03-13 15:29:46 +10:00
George Kadianakis 0ce32affc2 Merge branch 'tor-github/pr/763' into maint-0.4.0 2019-03-12 18:11:35 +02:00
Nick Mathewson 9c9214f2c9 Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0 2019-03-12 11:03:37 -04:00
teor 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
teor c7854933e9 Merge branch bug29706_029_refactor into bug29706_034_refactor 2019-03-12 11:31:52 +10:00
teor 9eeff921ae sr: BUG() on NULL sr_state before doing a state_query_*() 
Part of #29706.
 2019-03-12 11:14:30 +10:00
teor 0cca554110 sr: Check for replacing a SRV pointer with the same pointer 
Check if the new pointer is the same as the old one: if it is, it's
probably a bug:
* the caller may have confused current and previous, or
* they may have forgotten to sr_srv_dup().

Putting NULL multiple times is allowed.

Part of 29706.
 2019-03-12 11:14:30 +10:00
Nick Mathewson a9c84bfd35 Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0 2019-03-11 09:45:31 -04:00
teor 593fde930f sr: rename srv_dup() to sr_srv_dup() 2019-03-09 12:03:12 +10:00
teor 26e6f56023 sr: Free SRVs before replacing them in state_query_put_() 
Refactor the shared random state's memory management so that it actually
takes ownership of the shared random value pointers.

Fixes bug 29706; bugfix on 0.2.9.1-alpha.
 2019-03-09 12:03:00 +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
Nick Mathewson c40d53ab39 Merge branch 'pr_719_squashed_040' into maint-0.4.0 2019-03-08 10:25:43 -05:00
Mike Perry ff410edec0 Bug 29204: Inspect circuit queues before sending padding. 
Mitigates OOM conditions at relays.
 2019-03-08 10:25:28 -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 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 3af943dcd1 Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0 2019-03-07 08:56:35 -05:00
Nick Mathewson 9b4ecbaa7d Merge branch 'maint-0.3.5' into maint-0.4.0 2019-03-06 14:29:43 -05: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
David Goulet a999cb43df protover: Add missing Padding to translate_to_rust 
This commit also explicitly set the value of the PRT enum so we can match/pin
the C enum values to the Rust one in protover/ffi.rs.

Fixes #29631

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2019-03-05 12:33:43 -05:00
teor f186f21a4e doc: Fix an incorrect comment about calling FreeLibrary() on Windows 
There's an incorrect comment in compat_time.c that suggests we call
FreeLibrary() before we're done using the library's functions.
See 29642 for background.

Closes ticket 29643.
 2019-03-04 11:29:15 +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
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
Nick Mathewson dc19d65c3b Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0 2019-02-28 11:20:26 -05: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 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
Nick Mathewson 56f01e58b4 Merge remote-tracking branch 'tor-github/pr/731' into maint-0.4.0 2019-02-27 09:59:33 -05:00