Nick Mathewson
b2470f5140
Merge branch 'maint-0.3.3'
2018-06-12 08:11:20 -04:00
Nick Mathewson
6dca180ae9
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-12 08:11:20 -04:00
Nick Mathewson
74ac463e7f
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-12 08:11:20 -04:00
Nick Mathewson
19f3868523
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-12 08:11:19 -04:00
Nick Mathewson
8be3513743
start the 0.3.4.2-alpha changelog
2018-06-11 16:37:08 -04:00
Karsten Loesing
ae540569ce
Update geoip and geoip6 to the June 7 2018 database.
2018-06-11 21:58:55 +02:00
Nick Mathewson
f399887cfe
Merge remote-tracking branch 'mikeperry-github/bug26259'
2018-06-08 10:17:00 -04:00
Nick Mathewson
a141127435
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-08 10:12:57 -04:00
Nick Mathewson
dd63033fcb
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-06-08 10:11:57 -04:00
Nick Mathewson
1ef8023e00
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-06-08 10:11:57 -04:00
Nick Mathewson
aef0607f38
Merge branch 'maint-0.3.3'
2018-06-08 10:11:57 -04:00
Nick Mathewson
c27bb4072c
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-06-08 10:11:57 -04:00
rl1987
719b5c1d27
Avoid out-of-bounds smartlist access in protover_compute_vote()
...
and contract_protocol_list()
2018-06-08 10:11:32 -04:00
Nick Mathewson
3716ddf1b4
Merge remote-tracking branch 'rl1987/doc25237'
2018-06-02 11:35:06 -07:00
Nick Mathewson
9f884a38e3
Merge branch 'maint-0.3.3'
2018-06-02 10:36:49 -07:00
Nick Mathewson
f15f90e2ca
Merge branch 'bug26121-033-squashed' into maint-0.3.3
2018-06-02 10:36:44 -07:00
Mike Perry
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
Nick Mathewson
00e150a0e4
Merge branch 'bug25939_034_01_squashed'
2018-06-02 10:33:33 -07:00
David Goulet
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
rl1987
f8d549db7b
Point reader to a section in tor-spec.txt
2018-06-02 11:15:10 +03:00
Mike Perry
2b734944af
Bug 26259: Changes file.
2018-06-01 00:24:00 +00:00
Nick Mathewson
fa1890e97f
Merge remote-tracking branch 'public/bug25691_033_again_squashed' into maint-0.3.3
2018-05-27 10:03:11 -04:00
Nick Mathewson
3f3739c6e0
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-24 09:40:06 -04:00
Nick Mathewson
f48fb8a720
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-24 09:40:06 -04:00
Nick Mathewson
f42739e746
Merge branch 'maint-0.3.3'
2018-05-24 09:40:06 -04:00
Nick Mathewson
c000763f1e
Merge branch 'bug26116_033' into maint-0.3.3
2018-05-24 09:40:00 -04:00
Nick Mathewson
c380562aed
Merge branch 'bug26116_029' into maint-0.2.9
2018-05-24 09:39:46 -04:00
Nick Mathewson
7fb941e9f2
Merge branch 'appveyor_min_034_v2'
2018-05-23 15:08:50 -04:00
Nick Mathewson
36a107855b
Merge branch 'bug26156_034'
2018-05-23 09:08:57 -04:00
Nick Mathewson
e5541996b7
changes file for TROVE-2018-005
2018-05-22 12:29:14 -04:00
Nick Mathewson
a3a8d80beb
Merge branch 'trove-2018-005_032' into trove-2018-005_033
2018-05-22 12:27:15 -04:00
Nick Mathewson
d2bc019053
changes file for TROVE-2018-005
2018-05-22 12:26:23 -04:00
Nick Mathewson
48d752407b
Add a missing include to get the declaration of OPENSSL_1_1_API
...
Apparently, even though I had tested on OpenSSL 1.1.1 with
no-deprecated, OpenSSL 1.1.0 is different enough that I should have
tested with that as well.
Fixes bug 26156; bugfix on 0.3.4.1-alpha where we first declared
support for this configuration.
2018-05-22 10:05:27 -04:00
Nick Mathewson
e053c71e3e
Merge branch 'appveyor_min_029_v2' into appveyor_min_034_v2
2018-05-22 09:57:12 -04:00
Nick Mathewson
0c81bdc9ef
changes file for appveyor support
2018-05-22 09:56:33 -04:00
Nick Mathewson
add00045aa
Merge branch 'bug26101_26102'
2018-05-22 08:42:04 -04:00
Nick Mathewson
87a7748a84
remove already-merged changes file
2018-05-22 08:36:03 -04:00
Nick Mathewson
d2aefffe2f
Merge branch 'maint-0.3.3'
2018-05-22 08:35:41 -04:00
Nick Mathewson
3d12663243
Fix a crash bug when testing reachability
...
Fixes bug 25415; bugfix on 0.3.3.2-alpha.
2018-05-22 08:35:37 -04:00
Nick Mathewson
943291d7ae
Whoops -- add an entry I missed to the 0.3.4.1-alpha changelog
2018-05-17 12:47:06 -04:00
Nick Mathewson
3c4353179f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-16 12:11:45 -04:00
Nick Mathewson
8340f641c3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-16 12:11:45 -04:00
Nick Mathewson
d3a972561a
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-16 12:11:45 -04:00
Nick Mathewson
d1e4ffc710
Merge branch 'bug26072_029' into maint-0.2.9
2018-05-16 12:11:40 -04:00
Nick Mathewson
ddc3eb20b7
Merge branch 'bug26116_029' into bug26116_033
2018-05-16 11:43:53 -04:00
Nick Mathewson
881f7157f6
Return -1 from our PEM password callback
...
Apparently, contrary to its documentation, this is how OpenSSL now
wants us to report an error.
Fixes bug 26116; bugfix on 0.2.5.16.
2018-05-16 11:39:42 -04:00
Nick Mathewson
fcfa22d80a
Merge branch 'maint-0.3.3'
2018-05-16 12:11:46 -04:00
Nick Mathewson
e811bac837
use sortChanges to begin an 0.3.4.1-alpha changelog
2018-05-15 12:31:16 -04:00
Nick Mathewson
98aff146d3
Merge branch 'maint-0.3.3'
2018-05-15 09:32:45 -04:00
Nick Mathewson
6acbd4c112
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-15 09:32:44 -04:00
