cacf326e78
Revise geoip tests to not require paths of actual geoip config
...
When I wrote the first one of these, it needed the path of the geoip
file. But that doesn't translate well in at least two cases:
- Mingw, where the compile-time path is /c/foo/bar and the
run-time path is c:\foo\bar.
- Various CI weirdnesses, where we cross-compile a test binary,
then copy it into limbo and expect it to work.
Together, these problems precluded these tests running on windows.
So, instead let's just generate some minimal files ourselves, and
test against them.
Fixes bug 25787
2018-06-21 08:56:20 -04:00
fa195626bd
bump to 0.3.4.2-alpha
2018-06-11 16:49:17 -04:00
8be3513743
start the 0.3.4.2-alpha changelog
2018-06-11 16:37:08 -04:00
f399887cfe
Merge remote-tracking branch 'mikeperry-github/bug26259'
2018-06-08 10:17:00 -04:00
307008e869
Merge branch 'maint-0.3.3'
2018-06-08 10:12:57 -04:00
a141127435
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-08 10:12:57 -04:00
aef0607f38
Merge branch 'maint-0.3.3'
2018-06-08 10:11:57 -04:00
dd63033fcb
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-08 10:11:57 -04:00
c27bb4072c
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-08 10:11:57 -04:00
1ef8023e00
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-08 10:11:57 -04:00
719b5c1d27
Avoid out-of-bounds smartlist access in protover_compute_vote()
...
and contract_protocol_list()
2018-06-08 10:11:32 -04:00
3716ddf1b4
Merge remote-tracking branch 'rl1987/doc25237'
2018-06-02 11:35:06 -07:00
9f884a38e3
Merge branch 'maint-0.3.3'
2018-06-02 10:36:49 -07:00
f15f90e2ca
Merge branch 'bug26121-033-squashed' into maint-0.3.3
2018-06-02 10:36:44 -07:00
fe5764012a
Bug 26121: Improve BUILDTIMEOUT_SET accuracy.
...
We were miscounting the total number of circuits for the TIMEOUT_RATE and
CLOSE_RATE fields of this event.
2018-06-02 10:36:36 -07:00
00e150a0e4
Merge branch 'bug25939_034_01_squashed'
2018-06-02 10:33:33 -07:00
66e76066e0
hs-v3: Build onion address before registering ephemeral service
...
With the work on #25500 (reducing CPU client usage), the HS service main loop
callback is enabled as soon as the HS service map changes which happens when
registering a new service.
Unfortunately, for an ephemeral service, we were building the onion address
*after* the registration leading to the "service->onion_address` to be an
empty string.
This broke the "HS_DESC CREATED" event which had no onion address in it. And
also, we were logging an empty onion address for that service.
Fixes #25939
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-06-02 10:33:20 -07:00
f8d549db7b
Point reader to a section in tor-spec.txt
2018-06-02 11:15:10 +03:00
2b734944af
Bug 26259: Changes file.
2018-06-01 00:24:00 +00:00
93ee227e18
Bug 26259: Don't count 0-length RELAY_COMMAND_DATA in CIRC_BW OVERHEAD
...
This cell should be treated as invalid for purposes of CIRC_BW.
2018-06-01 00:23:08 +00:00
d7bbfd0f62
Fix various typos
2018-05-30 07:57:22 -07:00
aff49cc52d
Merge branch 'maint-0.3.3'
2018-05-27 10:04:42 -04:00
fa1890e97f
Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3
2018-05-27 10:03:11 -04:00
3f3739c6e0
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-24 09:40:06 -04:00
f48fb8a720
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-24 09:40:06 -04:00
f42739e746
Merge branch 'maint-0.3.3'
2018-05-24 09:40:06 -04:00
0ef432d457
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-24 09:40:06 -04:00
c000763f1e
Merge branch 'bug26116_033' into maint-0.3.3
2018-05-24 09:40:00 -04:00
c380562aed
Merge branch 'bug26116_029' into maint-0.2.9
2018-05-24 09:39:46 -04:00
aeb4be1d5a
Add a unit test for PEM-encrypted documents.
2018-05-24 09:36:33 -04:00
7fb941e9f2
Merge branch 'appveyor_min_034_v2'
2018-05-23 15:08:50 -04:00
36a107855b
Merge branch 'bug26156_034'
2018-05-23 09:08:57 -04:00
ff27b7ce60
Update version to 0.3.3.6-dev
2018-05-22 18:05:28 -04:00
68680a2391
remove the now-duplicate 0.3.3.6 stanzas
2018-05-22 18:03:25 -04:00
c5c227e140
copy changelog and releasenotes from 0.3.3.6
2018-05-22 18:07:10 -04:00
e185cac6f6
Merge branch 'maint-0.3.3'
...
"ours" merge to avoid version bump.
2018-05-22 18:05:42 -04:00
5b1f330766
forward-port all those changelog changes
2018-05-22 16:17:56 -04:00
123f8a18f2
reorder 0.3.3.3-alpha changelog
...
(it came out before 0.3.2.10, because 0.3.2.10 has backports from it)
2018-05-22 14:34:53 -04:00
38f8b3c63d
Merge branch 'maint-0.3.3'
2018-05-22 14:13:28 -04:00
80d673ccea
Merge branch 'trove-2018-005_032' into maint-0.3.3
2018-05-22 14:13:23 -04:00
7483aef896
avoid a signed/unsigned comparison.
2018-05-22 14:12:44 -04:00
cde5c9d0c3
Merge branch 'maint-0.3.3'
2018-05-22 13:35:33 -04:00
a5d4ce2b39
Make the TROVE-2018-005 fix work with rust.
2018-05-22 13:35:20 -04:00
b858f576c3
Merge branch 'maint-0.3.3'
2018-05-22 12:54:31 -04:00
6e8e005b53
Merge branch 'trove-2018-005_032' into maint-0.3.3
2018-05-22 12:54:26 -04:00
240bb17714
uint breaks compilation on windows
2018-05-22 12:54:05 -04:00
740b8bb79c
Merge branch 'maint-0.3.3'
...
"ours" merge to avoid version bump
2018-05-22 12:40:40 -04:00
074b182baa
version bump to 0.3.3.6
2018-05-22 12:40:18 -04:00
a789578889
Merge branch 'trove-2018-005_034'
2018-05-22 12:33:49 -04:00
1afdb5b6cc
Merge branch 'maint-0.3.3'
...
"Ours" merge to avoid the maint-0.3.3 version of the TROVE-2018-005
fix, which touches the files in their old locations.
2018-05-22 12:33:09 -04:00
Nick Mathewson
rl1987
Mike Perry
David Goulet
Roger Dingledine