rl1987
134a640a91
Remove linux-tor-prio.sh script
2019-03-10 19:12:47 +02:00
Nick Mathewson
e47e60c12e
Merge branch 'pr_719_squashed'
2019-03-08 10:24:00 -05:00
Mike Perry
cd67911033
Bug 29204: Inspect circuit queues before sending padding.
...
Mitigates OOM conditions at relays.
2019-03-08 10:23:47 -05:00
Nick Mathewson
d3fc9aef93
Merge branch 'maint-0.4.0'
2019-03-07 08:57:02 -05: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
82e1ec4087
Merge branch 'maint-0.4.0'
2019-03-07 08:34:46 -05:00
Nick Mathewson
d8409ccb76
Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0
2019-03-07 08:34:15 -05:00
Nick Mathewson
918bda25ad
Merge branch 'maint-0.4.0'
2019-03-06 14:29:48 -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
db2e916afe
Merge branch 'tor-github/pr/717'
2019-03-05 14:26:59 -05:00
rl1987
ae5a0f39cd
Update git pre-push hook so that only upstream branches can get pushed to origin
2019-03-05 14:26:09 -05:00
Nick Mathewson
f1890707cc
Merge branch 'maint-0.4.0'
2019-03-05 13:00:07 -05: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
Nick Mathewson
d24acc008d
Merge remote-tracking branch 'tor-github/pr/759'
2019-03-05 12:01:28 -05:00
Nick Mathewson
f8e38d21c2
Merge remote-tracking branch 'tor-github/pr/753'
2019-03-05 11:57:20 -05:00
Nick Mathewson
72751f0c30
Merge remote-tracking branch 'tor-github/pr/680'
2019-03-05 11:53:31 -05:00
Alexander Færøy
c9a9de120f
Fix changelog for ticket 25614 to make it pass check-changes.
...
Yawning's commit in fda61e030e
2019-03-05 15:50:30 +01:00
David Fifield
4578c3eb21
Set TOR_PT_EXIT_ON_STDIN_CLOSE=1 for client transports too.
...
Closes #25614 .
2019-03-05 15:24:31 +01:00
George Kadianakis
fe2552ad65
Merge branch 'tor-github/pr/739'
2019-03-04 18:52:19 +02:00
rl1987
27eec50527
manpage: fix formatting of example on quoting options with spaces
2019-03-03 11:51:08 +02:00
David Goulet
13e93bdfd5
Merge branch 'tor-github/pr/718'
2019-03-01 09:36:23 -05:00
Nick Mathewson
cb0d403049
Merge remote-tracking branch 'tor-github/pr/677'
2019-03-01 08:22:43 -05: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
d5f6137547
Merge branch 'maint-0.4.0'
2019-02-28 11:22:06 -05: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
George Kadianakis
cec555f44c
Merge branch 'tor-github/pr/720'
2019-02-28 12:32:16 +02: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
Neel Chauhan
c142e3d1e6
Set CIRCLAUNCH_NEED_UPTIME in rend_service_relaunch_rendezvous() on a hs_service_requires_uptime_circ()
2019-02-27 17:37:10 -05:00
teor
a479909ee8
appveyor: skip two redundant builds to speed up CI on Windows
...
Skip the Appveyor 32-bit Windows Server 2016 job, and 64-bit Windows
Server 2012 R2 job. The remaining 2 jobs still provide coverage of
64/32-bit, and Windows Server 2016/2012 R2.
Also set fast_finish, so failed jobs terminate the build immediately.
Fixes bug 29601; bugfix on 0.3.5.4-alpha.
2019-02-28 07:43:57 +10:00
Nick Mathewson
761eb4cf79
Merge branch 'maint-0.4.0'
2019-02-27 09:59:42 -05: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
teor
64e082e892
Merge branch 'bug29599_029' into bug29599_033
2019-02-27 15:06:39 +10:00
teor
4d9eb4dd0e
test/shared-random: Stop leaking shared random state in the unit tests
...
Stop leaking parts of the shared random state in the shared-random unit
tests.
Fixes bug 29599; bugfix on 0.2.9.1-alpha.
2019-02-27 15:04:40 +10:00
teor
15dc33849e
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-27 09:38:04 +10:00
teor
1a194beb2c
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-02-27 09:37:50 +10:00
teor
6c966b894c
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-02-27 09:37:36 +10:00
George Kadianakis
39a1049932
Merge branch 'tor-github/pr/729'
2019-02-26 20:15:40 +02:00
David Goulet
b402a0887f
Merge branch 'tor-github/pr/655'
2019-02-26 11:30:44 -05:00
David Goulet
2a44ee9b8c
Merge branch 'maint-0.4.0'
2019-02-26 11:25:16 -05:00
David Goulet
a5dd41b9af
Merge branch 'tor-github/pr/638' into maint-0.4.0
2019-02-26 11:24:43 -05:00
David Goulet
e1ad22643e
maint: Helpful scripts for tor maintenance
...
Closes #29391
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-02-26 10:52:25 -05:00
