Nick Mathewson
733afb52a8
Merge branch 'maint-0.4.0'
2019-03-11 09:45:48 -04: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
rl1987
134a640a91
Remove linux-tor-prio.sh script
2019-03-10 19:12:47 +02:00
rl1987
0befdb8a35
Disable git diff pagination
2019-03-10 18:28:07 +02:00
rl1987
537692c1e3
Using diff -u in check_for_diffs
2019-03-10 18:28:07 +02:00
rl1987
5f253f6a47
Iterate over contents of scripts/git with check_for_script_update function
2019-03-10 18:28:06 +02:00
rl1987
888bb9508b
Move all git maintenance scripts to separate directory
2019-03-10 18:28:06 +02:00
rl1987
7b5f31f2d6
Mention what file has changed
2019-03-10 18:28:06 +02:00
rl1987
73fed3ee1c
Add changes file
2019-03-10 18:28:06 +02:00
rl1987
88633fad5b
Write a comment for post-merge.git-hook
2019-03-10 18:28:06 +02:00
rl1987
bb8b2f47d0
Also print changes in git helper scripts, if any
2019-03-10 18:28:06 +02:00
rl1987
2d3ef34dce
Add post-merge git hook to warn about git hooks being updated in the repo
2019-03-10 18:28:06 +02:00
rl1987
4773fa6474
Revert "Walk back from requiring bash"
...
This reverts commit c346eff223
2019-03-10 18:16:58 +02: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
911f95ed92
Merge branch 'maint-0.4.0'
2019-03-08 10:25:57 -05: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
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
8fd20df455
Merge remote-tracking branch 'tor-github/pr/743'
2019-03-08 10:07:25 -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
df279880f8
Merge branch 'maint-0.4.0'
2019-03-08 14:12:00 +10:00
teor
968d2b87cb
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-08 14:11:46 +10:00
teor
ffd7207025
Merge remote-tracking branch 'tor-github/pr/733' into maint-0.3.5
2019-03-08 14:11:14 +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
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
7f0516022b
Also disallow pushing to/from upstream branch when branch names do not match
2019-03-05 14:26:09 -05:00
rl1987
0deea98d02
Improve pre-push.git-hook description
2019-03-05 14:26:09 -05:00
rl1987
f3eac74ed9
In pre-push hook script, actually check local and remote refs
2019-03-05 14:26:09 -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
