f42739e746
Merge branch '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
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
e5541996b7
changes file for TROVE-2018-005
2018-05-22 12:29:14 -04:00
a3a8d80beb
Merge branch 'trove-2018-005_032' into trove-2018-005_033
2018-05-22 12:27:15 -04:00
d2bc019053
changes file for TROVE-2018-005
2018-05-22 12:26:23 -04:00
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
e053c71e3e
Merge branch 'appveyor_min_029_v2' into appveyor_min_034_v2
2018-05-22 09:57:12 -04:00
0c81bdc9ef
changes file for appveyor support
2018-05-22 09:56:33 -04:00
add00045aa
Merge branch 'bug26101_26102'
2018-05-22 08:42:04 -04:00
87a7748a84
remove already-merged changes file
2018-05-22 08:36:03 -04:00
d2aefffe2f
Merge branch 'maint-0.3.3'
2018-05-22 08:35:41 -04:00
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
943291d7ae
Whoops -- add an entry I missed to the 0.3.4.1-alpha changelog
2018-05-17 12:47:06 -04:00
8340f641c3
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-16 12:11:45 -04:00
3c4353179f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-16 12:11:45 -04:00
d3a972561a
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-16 12:11:45 -04:00
d1e4ffc710
Merge branch 'bug26072_029' into maint-0.2.9
2018-05-16 12:11:40 -04:00
ddc3eb20b7
Merge branch 'bug26116_029' into bug26116_033
2018-05-16 11:43:53 -04:00
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
fcfa22d80a
Merge branch 'maint-0.3.3'
2018-05-16 12:11:46 -04:00
e811bac837
use sortChanges to begin an 0.3.4.1-alpha changelog
2018-05-15 12:31:16 -04:00
98aff146d3
Merge branch 'maint-0.3.3'
2018-05-15 09:32:45 -04:00
4aa3d511b2
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-15 09:32:44 -04:00
6acbd4c112
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-15 09:32:44 -04:00
502d2c0062
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-15 09:32:44 -04:00
033e4723f3
Update geoip and geoip6 to the May 1 2018 database.
2018-05-15 15:20:09 +02:00
db94d7fed2
Update cov-diff to handle new gcov, and remove timestamps
...
The new gcov sometimes emits *s if there is a line containing
multiple basic blocks, and some are not executed. (The gcov
documentation says something weird about this point, so I'm trying
to interpret it into the compilerese that I'm familiar with.)
That's bug 26101.
Also, when we're looking for unique variations in our coverage, we
would like cov-diff to suppress timestamps on the diffs. That's bug
26102.
Both of these are bugfixes on 0.2.5.1-alpha when the cov-diff script
was introduced.
My apologies for the perl.
2018-05-14 18:04:10 -04:00
5eb2d58880
Add a missing return after marking a stream for bad connected cell
...
Fixes bug 26072; bugfix on 0.2.4.7-alpha.
2018-05-14 15:54:48 -04:00
a394a2dd86
Merge branch 'bug25903_v5_squashed'
2018-05-14 14:25:07 -04:00
d27fd7ff6b
Merge remote-tracking branch 'rl1987/bug25852_take2'
2018-05-14 14:05:50 -04:00
aab626405c
Merge remote-tracking branch 'catalyst-github/bug25756'
2018-05-11 18:15:43 -04:00
f6c96fd0ca
Merge remote-tracking branch 'public/bug25994'
2018-05-11 17:57:59 -04:00
d50d07fce5
changes file for 25943 and 25944
2018-05-11 08:16:02 -04:00
7ee67c47fa
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-10 09:22:32 -04:00
b343ba9060
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-10 09:22:32 -04:00
382beb93cb
Merge branch 'maint-0.3.3'
2018-05-10 09:22:32 -04:00
6e99286d45
hs-v3: Add an extra white-space when parsing descriptor
...
The specification describes the signature token to be right after a newline
(\n) then the token "signature" and then a white-space followed by the encoded
signature.
This commit makes sure that when we parse the signature from the descriptor,
we are always looking for that extra white-space at the end of the token.
It will allow us also to support future fields that might start with
"signature".
Fixes #26069
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-05-10 09:16:50 -04:00
1eede00a4b
Merge branch 'ticket26063_squashed'
2018-05-10 09:13:28 -04:00
beca6a585c
Merge branch 'ticket26064'
2018-05-10 09:05:15 -04:00
8b4cf7771e
Enable/disable per-second callback as needed.
...
There are three cases where this can happen: changes in our
controller events, changes in our DisableNetwork setting, and
changes in our hibernation state.
Closes ticket 26063.
2018-05-10 09:02:44 -04:00
a4a7939ae1
Merge remote-tracking branch 'dgoulet/ticket26062_034_01'
2018-05-10 08:04:03 -04:00
59812789f7
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-05-10 08:03:04 -04:00
e5acbbd16d
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-05-10 08:02:10 -04:00
aa08c19703
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-05-10 08:00:35 -04:00
08bfb87d1b
Bug 25903: Changes file.
2018-05-09 21:23:11 +00:00
d972a8a944
Merge branch 'ticket26016'
2018-05-09 14:04:30 -04:00
f684b48b5b
Merge branch 'ticket26009'
2018-05-09 14:01:08 -04:00
c9f07f36bf
Mark the 1-per-sec update_current_time() call as redundant.
...
We still do this time update here, since we do it from all
callbacks, but it is no longer a reason to keep the once-per-second
callback enabled.
Closes ticket 26009.
2018-05-09 14:01:00 -04:00
Nick Mathewson
Karsten Loesing
David Goulet
Mike Perry