98b694bfd5
Merge branch 'isolate_libevent_2_squashed'
2018-04-06 08:50:35 -04:00
421c2310a8
changes file for libevent isolation work
2018-04-05 12:36:28 -04:00
2933f73b31
Merge branch 'maint-0.3.3'
2018-04-05 12:09:00 -04:00
12fc4206f2
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-05 12:09:00 -04:00
124e06e85c
Merge branch 'ticket25296_032_squashed' into maint-0.3.2
2018-04-05 12:08:53 -04:00
c2d93e8a7d
PerConnBW{Rate,Burst} docs: do not say consensus param is always set
...
Closes ticket 25296; bugfix on 0.2.2.7-alpha when these manpage
entries were introduced.
2018-04-05 12:08:35 -04:00
f5f9c25546
Switch to use should_record_bridge_info()
...
Both in geoip_note_client_seen() and options_need_geoip_info(), switch from
accessing the options directly to using the should_record_bridge_info() helper
function.
Fixes #25290
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-04-05 08:37:39 -04:00
2dee38fba0
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-05 08:36:13 -04:00
df519e5de8
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-05 08:36:13 -04:00
98157c72cd
Merge branch 'maint-0.3.3'
2018-04-05 08:36:13 -04:00
e813116d3d
Switch Travis to stable rust
2018-04-05 08:36:09 -04:00
ad8347418f
Merge branch 'maint-0.3.3'
2018-04-05 08:22:35 -04:00
78bf564168
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-05 08:22:34 -04:00
9b10eb2d7a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-05 08:22:34 -04:00
834eef2452
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-05 08:22:34 -04:00
b68e636b33
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-04-05 08:22:33 -04:00
43f3155582
Merge branch 'maint-0.3.3'
2018-04-05 08:21:43 -04:00
ac3e389dbd
Merge remote-tracking branch 'dgoulet/bug25582_033' into maint-0.3.3
2018-04-05 08:21:38 -04:00
8f798b686d
Merge branch 'bug25679_033_squashed' into maint-0.3.3
2018-04-05 08:20:15 -04:00
e3ad4957a8
Fix the default for TOR_RUST_DEPENDENCIES
...
By default, we want to look at the crates directory of the
submodule, not the toplevel of the submodule. Fixes bug 25679;
bugfix on 0.3.3.1-alpha.
2018-04-05 08:20:07 -04:00
1fa396b0a4
Update geoip and geoip6 to the April 3 2018 database.
2018-04-05 10:42:25 +02:00
52846f728d
Merge branch 'maint-0.3.3'
2018-04-04 08:57:24 -04:00
ec8ee54129
Merge branch 'bug21394_029_redux' into maint-0.3.3
2018-04-04 08:55:37 -04:00
06484eb5e1
Bug 21394 touchup: Increase DNS attempts to 3
...
Also don't give up on a resolver as quickly if multiple are configured.
2018-04-04 08:54:25 -04:00
218b1746ba
Merge remote-tracking branch 'fristonio/ticket-25645'
2018-04-03 19:19:02 -04:00
21c81348a3
Fix bug24031 changes file
2018-04-03 19:03:33 -04:00
7ccb1c5a85
add a missing word
2018-04-03 15:31:30 -04:00
b503df2775
changes: Add changes file for #24031 .
...
(cherry picked from commit 5a8cdec3f8
2018-04-03 19:21:25 +00:00
5a8cdec3f8
changes: Add changes file for #24031 .
2018-04-03 19:19:40 +00:00
2680a8b5b1
ticket(25645): remove unused variable n_possible from channel_get_for_extend()
2018-04-03 09:17:23 +05:30
3df9545492
Merge branch 'maint-0.3.3'
2018-04-02 08:51:47 -04:00
6190593256
use channel_is_client for create cell counts
...
When a relay is collecting internal statistics about how many
create cell requests it has seen of each type, accurately count the
requests from relays that temporarily fall out of the consensus.
(To be extra conservative, we were already ignoring requests from clients
in our counts, and we continue ignoring them here.)
Fixes bug 24910; bugfix on 0.2.4.17-rc.
2018-04-02 01:00:31 -04:00
961d2ad597
dir auths no longer vote Guard if they're not voting V2Dir
...
Directory authorities no longer vote in favor of the Guard flag
for relays that don't advertise directory support.
Starting in Tor 0.3.0.1-alpha, Tor clients have been avoiding using
such relays in the Guard position, leading to increasingly broken load
balancing for the 5%-or-so of Guards that don't advertise directory
support.
Fixes bug 22310; bugfix on 0.3.0.6.
2018-04-02 00:20:01 -04:00
596eed3715
Fix CID 1433643
...
Add a missing lock acquisition around access to queued_control_events
in control_free_all(). Use the reassign-and-unlock strategy as in
queued_events_flush_all(). Fixes bug 25675. Coverity found this bug,
but only after we recently added an access to
flush_queued_event_pending.
2018-03-29 17:21:33 -05:00
6d7c4c6ec2
Remove erroneous section heading "ExitPolicyDefault"
...
The anchor here was originally introduced to make sure that the
manpage would format correctly, but we had mistaken it for a section
anchor, and introduced a bogus section heading in 3563a2c819
2018-03-29 15:06:07 -04:00
2c1afc2def
Merge branch 'maint-0.3.3'
2018-03-29 14:59:01 -04:00
4f473fadbd
Merge branch 'bug25617_029' into maint-0.3.3
2018-03-29 14:58:58 -04:00
e35eb9baaa
Mark controller-initiated DNS lookups as permitted to do DNS.
...
Fixes bug 25617; bugfix on 0.2.9.3-alpha.
2018-03-29 09:27:28 -04:00
024a1aaa66
Remove changes files from master for stuff that will be in 0.3.3.4-alpha
2018-03-29 08:03:08 -04:00
f3161adcd0
Improve bug25398 changes again.
2018-03-29 07:38:55 -04:00
99641c93ce
Make check-changes pass on changes/bug25398
2018-03-28 14:48:36 -04:00
2f872f9762
Merge remote-tracking branch 'hello71/bug25398'
2018-03-28 14:47:05 -04:00
4c0e434f33
Merge remote-tracking branch 'public/bug25512'
2018-03-28 14:45:47 -04:00
cb083b5d3e
Merge remote-tracking branch 'asn-github/t-25432'
2018-03-28 14:43:33 -04:00
794a25f8c1
Merge branch 'maint-0.3.3'
2018-03-28 14:23:06 -04:00
e0bbef48bf
Merge remote-tracking branch 'dgoulet/bug24767_033_03' into maint-0.3.3
2018-03-28 14:21:04 -04:00
a3c1d78c29
Merge branch 'maint-0.3.3'
2018-03-28 08:11:46 -04:00
3cc382b93e
add a changes file for the rust libc update
2018-03-28 08:10:54 -04:00
6317aa2cc0
Merge branch 'maint-0.3.3'
2018-03-28 07:50:47 -04:00
df529c6093
Adding changes file
2018-03-28 07:39:03 -04:00
Nick Mathewson
Neel Chauhan
Taylor Yu
Karsten Loesing
Dhalgren
Isis Lovecruft
Deepesh Pathak
Roger Dingledine
rl1987