ea84d62bc2
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-12 14:22:08 -04:00
ec2a2a6b7a
Fix #28525 changes file that is breaking CI.
2019-03-12 20:11:51 +02:00
ab34f49be9
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-12 18:11:53 +02:00
0ce32affc2
Merge branch 'tor-github/pr/763' into maint-0.4.0
2019-03-12 18:11:35 +02:00
feda2231a2
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-12 11:03:47 -04:00
9c9214f2c9
Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
2019-03-12 11:03:37 -04:00
dfc3e552a3
test/sr: update sr_state_free() to sr_state_free_all()
...
The function name changed between 0.2.9 and 0.3.4.
2019-03-12 11:34:52 +10:00
c7854933e9
Merge branch bug29706_029_refactor into bug29706_034_refactor
2019-03-12 11:31:52 +10:00
9eeff921ae
sr: BUG() on NULL sr_state before doing a state_query_*()
...
Part of #29706 .
2019-03-12 11:14:30 +10:00
0cca554110
sr: Check for replacing a SRV pointer with the same pointer
...
Check if the new pointer is the same as the old one: if it is, it's
probably a bug:
* the caller may have confused current and previous, or
* they may have forgotten to sr_srv_dup().
Putting NULL multiple times is allowed.
Part of 29706.
2019-03-12 11:14:30 +10:00
d1a1be822e
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-11 09:45:48 -04:00
a9c84bfd35
Merge remote-tracking branch 'tor-github/pr/756' into maint-0.4.0
2019-03-11 09:45:31 -04:00
593fde930f
sr: rename srv_dup() to sr_srv_dup()
2019-03-09 12:03:12 +10:00
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
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
31a9caa274
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-08 10:25:57 -05:00
c40d53ab39
Merge branch 'pr_719_squashed_040' into maint-0.4.0
2019-03-08 10:25:43 -05:00
ff410edec0
Bug 29204: Inspect circuit queues before sending padding.
...
Mitigates OOM conditions at relays.
2019-03-08 10:25:28 -05:00
20a25b1cad
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-08 14:11:53 +10:00
968d2b87cb
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-08 14:11:46 +10:00
ffd7207025
Merge remote-tracking branch 'tor-github/pr/733' into maint-0.3.5
2019-03-08 14:11:14 +10:00
08ddf1f62b
Merge remote-tracking branch 'bug28525_029' into maint-0.3.5
2019-03-08 12:33:00 +10:00
63b4049114
Make tor_addr_is_internal_() RFC6598 (Carrier Grade NAT) aware
...
Fixes 28525.
2019-03-08 12:19:12 +10:00
1128eec836
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-07 08:57:00 -05:00
3af943dcd1
Merge remote-tracking branch 'tor-github/pr/745' into maint-0.4.0
2019-03-07 08:56:35 -05:00
9152692b99
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-07 08:34:44 -05:00
d8409ccb76
Merge remote-tracking branch 'tor-github/pr/733' into maint-0.4.0
2019-03-07 08:34:15 -05:00
5c78bd3224
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-06 14:29:45 -05:00
9b4ecbaa7d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-06 14:29:43 -05:00
d6f77b99da
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-06 14:29:38 -05:00
155b0f5521
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-03-06 14:29:33 -05:00
0c9cd7c487
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-03-06 14:29:29 -05:00
2e74edb53e
Update geoip and geoip6 to the March 4 2019 database.
2019-03-06 11:45:27 +01:00
ea1de84432
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-05 13:00:05 -05:00
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
f186f21a4e
doc: Fix an incorrect comment about calling FreeLibrary() on Windows
...
There's an incorrect comment in compat_time.c that suggests we call
FreeLibrary() before we're done using the library's functions.
See 29642 for background.
Closes ticket 29643.
2019-03-04 11:29:15 +10:00
5529449bb2
Merge branch 'maint-0.4.0' into release-0.4.0
2019-03-01 14:17:41 +10:00
955a622391
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-03-01 14:17:31 +10:00
1c248fa27d
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-03-01 14:16:59 +10:00
f56645917e
Merge branch 'maint-0.3.3' into maint-0.3.4
2019-03-01 14:16:22 +10:00
76b55fde81
Merge branch 'maint-0.2.9' into maint-0.3.3
2019-03-01 14:15:59 +10:00
7786198eef
Merge remote-tracking branch 'tor-github/pr/749' into maint-0.2.9
2019-03-01 14:15:00 +10:00
c1ab538479
Merge remote-tracking branch 'tor-github/pr/748' into maint-0.2.9
2019-03-01 14:14:51 +10:00
ecbc2e80a0
Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9
2019-03-01 14:14:26 +10:00
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
35a2590f29
Merge branch 'maint-0.4.0' into release-0.4.0
2019-02-28 11:22:03 -05:00
dc19d65c3b
Merge remote-tracking branch 'tor-github/pr/728' into maint-0.4.0
2019-02-28 11:20:26 -05:00
a0ada65a3a
Merge branch 'maint-0.4.0' into release-0.4.0
2019-02-28 10:49:55 +10:00
aef6e61347
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-02-28 10:49:47 +10:00
de0969ef78
Merge branch 'maint-0.3.4' into maint-0.3.5
2019-02-28 10:49:33 +10:00
Nick Mathewson
George Kadianakis
teor
Mike Perry
Neel Chauhan
Karsten Loesing
David Goulet
Kris Katterjohn