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
23,769 Commits 53 Branches 631 Tags
dbb9ec494f61bb994a310f5cef849e0fdde30efd
Commit Graph

4936 Commits

Author SHA1 Message Date
Nick Mathewson dbb9ec494f Merge branch 'maint-0.2.9' into release-0.2.9 2017-11-13 12:57:58 -05:00
Nick Mathewson 543fd89fb7 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-11-13 12:57:58 -05:00
Nick Mathewson 800797e7f3 Merge branch 'bug23291_028' into maint-0.2.8 2017-11-13 12:57:55 -05:00
Nick Mathewson 97c3fac6d4 Merge branch 'maint-0.2.9' into release-0.2.9 2017-11-13 11:18:02 -05:00
Nick Mathewson ab415ae950 Merge remote-tracking branch 'teor/bug23470-029' into maint-0.2.9 2017-11-13 11:17:58 -05:00
Nick Mathewson 420e8737b4 Merge branch 'maint-0.2.9' into release-0.2.9 2017-11-13 11:15:50 -05:00
Nick Mathewson 666653758d Merge branch 'bug8185_025' into maint-0.2.9 2017-11-13 11:15:47 -05:00
Nick Mathewson 15179a3e01 Merge branch 'maint-0.2.9' into release-0.2.9 2017-11-13 11:13:22 -05:00
Nick Mathewson c928fb988a Merge branch 'ticket21953_029' into maint-0.2.9 2017-11-13 11:13:18 -05:00
Nick Mathewson c9b76a12f5 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-11-11 12:23:33 -05:00
Nick Mathewson c24b90e3ac Merge branch 'maint-0.2.9' into release-0.2.9 2017-11-11 12:23:33 -05:00
Nick Mathewson 9666c620d5 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-11-11 12:23:33 -05:00
Karsten Loesing 6f8c32b7de Update geoip and geoip6 to the November 6 2017 database. 2017-11-10 10:14:09 +01:00
Nick Mathewson fecc5c61fc Merge branch 'maint-0.2.9' into release-0.2.9 2017-10-31 11:43:14 -04:00
Nick Mathewson 04d4786cc4 Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9 2017-10-31 11:43:07 -04:00
Nick Mathewson 3353942fde start a changelog for 0.2.9.13 2017-10-24 08:56:43 -04:00
Nick Mathewson 4dad6123cf Merge branch 'maint-0.2.9' into release-0.2.9 2017-10-23 15:53:50 -04:00
Nick Mathewson b1bd1bf19f Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9 2017-10-23 15:53:45 -04:00
Nick Mathewson d65016c0bb Merge branch 'maint-0.2.9' into release-0.2.9 2017-10-23 09:06:34 -04:00
Nick Mathewson 1db5081ba1 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-10-23 09:06:34 -04:00
Nick Mathewson 8cc147aa83 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-10-23 09:04:56 -04:00
David Goulet 15a699462d dirauth: Add bastet to the default authorities 
Fixes #23910

Based on a patch by dgoulet; backported to 0.2.5
 2017-10-23 09:03:36 -04:00
Nick Mathewson b1445b19e4 Merge branch 'maint-0.2.9' into release-0.2.9 2017-10-23 08:59:11 -04:00
Nick Mathewson c958fda6e2 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-10-23 08:59:11 -04:00
Nick Mathewson 9a1b385462 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-10-23 08:58:28 -04:00
Nick Mathewson d818f1e86d Merge branch 'maint-0.2.9' into release-0.2.9 2017-10-23 08:53:25 -04:00
Nick Mathewson 132e2f69b1 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-10-23 08:53:25 -04:00
Nick Mathewson 6f87a85897 Merge remote-tracking branch 'public/bug23690_028' into maint-0.2.8 2017-10-23 08:53:14 -04:00
Nick Mathewson 94f478c84a Merge branch 'maint-0.2.9' into release-0.2.9 2017-10-23 08:47:58 -04:00
Nick Mathewson fcaf3335b4 Merge remote-tracking branch 'public/bug23081_025' into maint-0.2.9 2017-10-23 08:47:52 -04:00
Nick Mathewson 3bf1d81a1d Merge branch 'maint-0.2.9' into release-0.2.9 2017-10-23 08:46:29 -04:00
Nick Mathewson 68dea082e7 Merge remote-tracking branch 'public/bug22349_029' into maint-0.2.9 2017-10-23 08:46:26 -04:00
Nick Mathewson 5d219ecf98 Update Longclaw's IP address; fixes 23592. 2017-10-17 14:00:30 -04:00
teor 5bca66be49 Clear the address when node_get_prim_orport() returns early 
Fixes bug 23874; bugfix on 0.2.8.2-alpha.
 2017-10-15 16:48:36 -04:00
Nick Mathewson 91c17ffbd6 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-10-05 11:04:59 -04:00
Nick Mathewson 4b6ba09674 Merge branch 'maint-0.2.9' into release-0.2.9 2017-10-05 11:04:59 -04:00
Nick Mathewson 43ebe54a24 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-10-05 11:04:59 -04:00
Nick Mathewson 2e21493a88 add missing subcategory in changes file 2017-10-05 11:04:54 -04:00
Nick Mathewson d6bdec1595 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-10-05 11:03:35 -04:00
Nick Mathewson 5d516315f5 Merge branch 'maint-0.2.9' into release-0.2.9 2017-10-05 11:03:35 -04:00
Nick Mathewson 2984d99165 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-10-05 11:03:35 -04:00
Karsten Loesing b9d9b16b76 Update geoip and geoip6 to the October 4 2017 database. 2017-10-05 16:56:14 +02:00
Nick Mathewson c50c98ba6a Make changes in server_mode() affect workers; fix a crash. 
Without this fix, changes from client to bridge don't trigger
transition_affects_workers(), so we would never have actually
initialized the cpuworkers.

Fixes bug 23693.  Bugfix on 3bcdb26267 0.2.6.3-alpha, which
fixed bug 14901 in the general case, but not on the case where
public_server_mode() did not change.
 2017-10-02 11:11:30 -04:00
Nick Mathewson f7222e6d8c Clear outbuf_flushlen when we clear a connection's outbuf 
When we added single_conn_free_bytes(), we cleared the outbuf on a
connection without setting outbuf_flushlen() to 0.  This could cause
an assertion failure later on in flush_buf().

Fixes bug 23690; bugfix on 0.2.6.1-alpha.
 2017-09-29 10:00:14 -04:00
Nick Mathewson d256d4c0a6 Don't package cells onto marked circuits. 
This caused a BUG log when we noticed that the circuit had no
channel.  The likeliest culprit for exposing that behavior is
d769cab3e5, where we made circuit_mark_for_close() NULL out
the n_chan and p_chan fields of the circuit.

Fixes bug 8185; bugfix on 0.2.5.4-alpha, I think.
 2017-09-29 09:33:47 -04:00
Nick Mathewson 2ef4a59a40 Merge branch 'maint-0.2.9' into release-0.2.9 2017-09-20 08:32:55 -04:00
Nick Mathewson 2c93be80d9 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-09-20 08:32:55 -04:00
teor 8e52c46581 Remove longclaw's IPv6 address, as it will soon change 
Authority IPv6 addresses were originally added in 0.2.8.1-alpha.

This leaves 3/8 directory authorities with IPv6 addresses, but there
are also 52 fallback directory mirrors with IPv6 addresses.

Resolves 19760.
 2017-09-20 14:48:53 +10:00
Nick Mathewson 2e47bfad4f finish changelog for 0.2.9.12 2017-09-18 09:57:26 -04:00
Nick Mathewson 7c61c437b3 Merge branch 'maint-0.2.9' into release-0.2.9 2017-09-18 09:40:40 -04:00