Nick Mathewson
07b486c17a
Merge branch 'bug24734_squashed'
2018-05-01 08:51:32 -04:00
Neel Chauhan
5458ff20a5
Remove the return value from the fascist_firewall_choose_address_* family of functions
2018-05-01 08:51:16 -04:00
Nick Mathewson
72124dc1ef
Merge branch 'ticket25948_squashed'
2018-04-30 16:46:59 -04:00
Nick Mathewson
987a7f6676
Move responsibility for or_state_save() to a scheduled callback
...
Closes ticket 25948.
2018-04-30 16:46:52 -04:00
Nick Mathewson
6cb467b462
Merge remote-tracking branch 'github/ticket23354'
2018-04-30 09:45:28 -04:00
Nick Mathewson
a9736f1f38
Merge remote-tracking branch 'github/ticket19429_034'
2018-04-30 09:41:33 -04:00
Nick Mathewson
346c2eb4e6
Merge branch 'bug25843_v2_squashed'
2018-04-27 12:45:07 -04:00
George Kadianakis
d00ed406e0
Introduce torrc option NumPrimaryGuards
2018-04-27 12:44:54 -04:00
David Goulet
05d314f888
main: Add mainloop callback event flags
...
Implement the ability to set flags per events which influences the set up of
the event.
This commit only adds one flag which is "need network" meaning that the event
is not enabled if tor has disabled the network or if hibernation mode.
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-27 09:28:00 -04:00
Nick Mathewson
857e210b7d
Merge branch 'ticket25931'
2018-04-26 13:52:16 -04:00
Nick Mathewson
96c5ac338a
Move close-and-cleanup functions to a postloop event.
...
Implements ticket 25932.
2018-04-26 13:15:38 -04:00
Nick Mathewson
8a81a70878
Move consdiffmgr_rescan() into a mainloop event.
...
The change here was very simple, since there is a flag set whenever
we want to schedule this event.
Closes ticket 25391.
m
2018-04-26 12:20:01 -04:00
Nick Mathewson
8664f76dd2
Merge branch 'maint-0.3.3'
2018-04-24 10:38:37 -04:00
Nick Mathewson
d44753b0e8
Merge branch 'travis_distcheck_033' into maint-0.3.3
2018-04-24 10:38:34 -04:00
Nick Mathewson
ea3c3a10a2
Merge branch 'maint-0.3.3'
2018-04-24 10:37:36 -04:00
Nick Mathewson
7e7b052b2a
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-24 10:37:36 -04:00
Nick Mathewson
9187cdb1cd
Merge remote-tracking branch 'dgoulet/bug25901_032_01' into maint-0.3.2
2018-04-24 10:36:17 -04:00
Nick Mathewson
9be7608fda
Merge branch 'maint-0.3.3'
2018-04-24 08:51:58 -04:00
Nick Mathewson
6182f60f75
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-24 08:51:55 -04:00
Nick Mathewson
d2951b381b
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-24 08:49:24 -04:00
Nick Mathewson
e888634076
Merge remote-tracking branch 'public/bug23693_031_redux' into maint-0.3.1
2018-04-24 08:49:20 -04:00
David Goulet
b259008c56
hs: Fix memleak in v3 on SIGHUP
...
Fixes #25901
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-04-23 11:09:57 -04:00
Nick Mathewson
3527f4b8a4
Merge remote-tracking branch 'github/lazy_bucket_refill'
2018-04-23 09:47:05 -04:00
Nick Mathewson
e8683bcbb1
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-23 09:24:33 -04:00
Nick Mathewson
1438c6c713
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-23 09:23:31 -04:00
Nick Mathewson
5c3639923f
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-04-23 09:23:31 -04:00
Nick Mathewson
c5ffcbb43f
Merge branch 'maint-0.3.3'
2018-04-23 09:23:31 -04:00
Nick Mathewson
beb321d8cd
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-23 09:23:31 -04:00
Nick Mathewson
c4be6dfeab
Permit the nanosleep system call in the seccomp2 callbox
...
Fixes bug 24969; bugfix on 0.2.5.1-alpha when the sandbox was introduced.
2018-04-23 09:15:40 -04:00
Nick Mathewson
cd3fc2aa48
Merge remote-tracking branch 'neel/b25511-r4'
2018-04-23 09:13:24 -04:00
Nick Mathewson
915791bc48
Merge branch 'ticket25024_squashed'
2018-04-22 20:53:04 -04:00
Nick Mathewson
fa21ac1de6
Tweak changes file for 25024 to mention "check-typos"
2018-04-22 20:52:55 -04:00
Deepesh Pathak
72bfcb37f1
add changes file and update check-typos in makefile
2018-04-22 20:48:48 -04:00
Nick Mathewson
1ba9b7e013
Merge remote-tracking branch 'mikeperry/bug25400_squashed'
2018-04-22 20:39:35 -04:00
Nick Mathewson
0e8ae82a87
Merge branch 'remove_old_consensus_methods_2018_squashed'
2018-04-22 20:01:09 -04:00
Nick Mathewson
ade3c74007
Add a changes file for removing old consensus methods
...
(Ticket 24378; proposal 290.)
2018-04-22 20:00:47 -04:00
Nick Mathewson
6773102c92
Merge branch 'bug25691_033_again_squashed'
2018-04-22 19:44:27 -04:00
Nick Mathewson
0f3d73a2d0
Add a changes file for 25691/25692
2018-04-22 19:42:28 -04:00
Nick Mathewson
71d503201e
Changes file for ticket 23354 (remove old download schedules)
2018-04-22 15:56:28 -04:00
Nick Mathewson
d8ac7d557c
Merge branch 'maint-0.3.3'
2018-04-20 14:40:09 -04:00
Nick Mathewson
cb813a352c
Fix documentation bug 25857: the universe is ::/0, not ::/128
...
Patch from CTassisF.
2018-04-20 14:35:33 -04:00
Nick Mathewson
bf466f5503
Merge branch 'travis_distcheck_029' into travis_distcheck_033
2018-04-18 18:34:28 -04:00
Nick Mathewson
6125133715
Add distcheck support to travis configuration.
...
Implements 25814.
2018-04-18 17:33:19 -04:00
Nick Mathewson
32181cbaa2
mention 19429 in changes file
2018-04-18 13:03:31 -04:00
Nick Mathewson
c296f00254
Changes file for openssl no-deprecated work.
2018-04-18 12:35:36 -04:00
Nick Mathewson
47df912f1c
Remove the periodic refill event entirely.
...
Now that we update our buckets on demand before reading or writing,
we no longer need to update them all every TokenBucketRefillInterval
msec.
When a connection runs out of bandwidth, we do need a way to
reenable it, however. We do this by scheduling a timer to reenable
all blocked connections for TokenBucketRefillInterval msec after a
connection becomes blocked.
(If we were using PerConnBWRate more, it might make sense to have a
per-connection timer, rather than a single timeout. But since
PerConnBWRate is currently (mostly) unused, I'm going to go for the
simpler approach here, since usually whenever one connection has
become blocked on bandwidth, most connections are blocked on
bandwidth.)
Implements ticket 25373.
2018-04-17 18:20:03 -04:00
Nick Mathewson
9af4cd6f31
Refactor responsibility for checking global write bucket emptiness
...
We used to do this 10x per second in connection_buckets_refill();
instead, we now do it when the bucket becomes empty. This change is
part of the work of making connection_buckets_refill() obsolete.
Closes ticket 25828; bugfix on 0.2.3.5-alpha.
2018-04-17 12:12:07 -04:00
Nick Mathewson
f0230ee38a
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-04-17 10:48:18 -04:00
Nick Mathewson
44aa586dea
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-04-17 10:48:18 -04:00
Nick Mathewson
002c5ca5d1
Merge branch 'maint-0.3.3'
2018-04-17 10:48:18 -04:00