Sebastian Hahn
96a24568ca
Reword requirement to set Myfamily correctly
2018-01-11 22:03:14 +01:00
Nick Mathewson
42751e2123
On shutdown, mark openssl as uninitialized.
...
This causes openssl to get completely reinitialized on startup,
which is probably a good idea.
2018-01-11 13:00:15 -05:00
Nick Mathewson
18ea91ee6b
Make the warnings about restarting tor in-process more scary.
2018-01-11 12:46:50 -05:00
Nick Mathewson
05ac3d0458
Merge branch 'restart_nocrash'
2018-01-11 12:45:25 -05:00
Nick Mathewson
751595551a
Merge branch 'simplify_transition_allowed'
2018-01-11 12:39:37 -05:00
Nick Mathewson
c349bfec36
Merge branch 'bug24526_squashed'
2018-01-11 12:33:52 -05:00
Nick Mathewson
ac0f819ce5
Note contactinfo and myfamily as required in more places
...
Includes a sentence from cypherpunks; for ticket 24526.
2018-01-11 12:33:30 -05:00
Nick Mathewson
e8bd806412
Add a blank line per dgoulet review.
2018-01-11 12:29:29 -05:00
Nick Mathewson
d0adf5ae95
Merge branch 'bug24584'
2018-01-11 12:28:29 -05:00
Nick Mathewson
81aec1449b
Compute flavor name before dereference, to avoid a STACK warning.
...
(See 24423)
2018-01-11 11:31:03 -05:00
Nick Mathewson
7a60600411
Merge remote-tracking branch 'ffmancera/github/bug24573'
2018-01-11 08:31:25 -05:00
Nick Mathewson
c8c258a433
Merge branch 'bug24733_squashed_2'
2018-01-10 12:57:23 -05:00
Nick Mathewson
519fa1a3e6
Document the alignment limitation of tor_free()
2018-01-10 12:57:13 -05:00
Nick Mathewson
f71bbd20a4
Extract the raw_free() of ifc_buf into a new function.
...
Explain the problem more correctly.
2018-01-10 12:57:13 -05:00
teor
54899b404c
Stop invoking undefined behaviour by using tor_free() on an unaligned pointer
...
... in get_interface_addresses_ioctl().
This pointer alignment issue exists on x86_64 macOS, but is unlikely to exist
elsewhere. (i386 macOS only requires 4-byte alignment, and other OSs have
8-byte ints.)
Fixes bug 24733; not in any released version of tor.
2018-01-10 12:57:13 -05:00
Nick Mathewson
ca1d1c382c
Merge remote-tracking branch 'ffmancera/github/bug24501'
2018-01-10 12:46:39 -05:00
Nick Mathewson
d8c0c62c7b
Remove needless parentheses
2018-01-10 09:39:13 -05:00
Nick Mathewson
4715d81809
Merge remote-tracking branch 'teor/Bug-23966'
2018-01-10 09:38:38 -05:00
Nick Mathewson
2d2a0c4116
ticket 22145 changes file
2018-01-10 09:35:11 -05:00
Nick Mathewson
2fa97dfb73
Merge remote-tracking branch 'teor/bug22145_032'
2018-01-10 09:33:55 -05:00
Nick Mathewson
29784d80fa
Merge branch 'maint-0.3.2'
...
"ours" merge to avoid version bump.
2018-01-09 10:12:43 -05:00
Nick Mathewson
34c6034aa7
Increment version to 0.3.2.9-dev
2018-01-09 10:12:25 -05:00
Nick Mathewson
83a734324d
Forward-port changelog and releasenotes for 0.3.2.9
2018-01-09 10:11:46 -05:00
Nick Mathewson
43937b9d64
Merge branch 'maint-0.3.2'
...
"ours" merge to avoid version bump.
2018-01-08 11:39:38 -05:00
Nick Mathewson
1f7f930f9e
Increment version to 0.3.2.9
2018-01-08 11:39:24 -05:00
Nick Mathewson
9ba69be96c
Merge branch 'maint-0.3.2'
...
There was a merge conflict on fallback_dirs.inc, which we resolve in
favor of the newly generated version for #24801 .
2018-01-08 11:10:53 -05:00
Nick Mathewson
b85fa0bd5f
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-08 11:10:36 -05:00
Nick Mathewson
e3ab27001f
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-08 11:10:36 -05:00
Nick Mathewson
1c5c5f0e50
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-01-08 11:10:36 -05:00
Nick Mathewson
9464da210d
Add changes file for new fallback directory list.
2018-01-08 11:09:08 -05:00
Nick Mathewson
a42e52dded
Add 7 other fallback dirs from teor's tests
...
These are from "fallback_dirs_2018_01_06_2323_UTC_44aa1adf35_AU.inc"
2018-01-08 11:03:44 -05:00
Nick Mathewson
491c09c19a
Update the fallback_dirs.inc file: part 1
...
This takes the updated fallback_dirs_2018_01_06_CA.inc from
pastly's scan.
2018-01-08 10:57:06 -05:00
Nick Mathewson
d637468128
Merge remote-tracking branch 'arma/bug24555'
2018-01-08 10:45:40 -05:00
Nick Mathewson
748ad2124d
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-01-08 09:35:55 -05:00
Nick Mathewson
942fa0c4a2
Merge branch 'maint-0.3.2'
2018-01-08 09:35:55 -05:00
Nick Mathewson
a1ce1ab201
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-08 09:34:57 -05:00
Nick Mathewson
8042c356f4
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-08 09:34:56 -05:00
Nick Mathewson
26e28829da
Merge branch 'maint-0.2.5' into maint-0.2.9
2018-01-08 09:34:56 -05:00
Fernando Fernandez Mancera
7353c9496e
Add free_openssl() to crypto_openssl module.
...
Add free_openssl() function to free the memory allocated for OpenSSL version
management variables. It is required since OpenSSL management has been isolated
from the crypto module.
Follows #24658 .
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
2018-01-08 15:31:41 +01:00
Fernando Fernandez Mancera
4022277272
Refactor crypto.[ch] into smaller OpenSSL module.
...
Add two new files (crypto_openssl.c, crypto_openssl.h) as new module of
crypto.[ch]. This new module includes all functions and dependencies related
to OpenSSL management. Those have been removed from crypto.[ch].
All new changes related to OpenSSL management must be done in these files.
Follows #24658
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
2018-01-08 14:02:17 +01:00
Karsten Loesing
8efbeb0982
Update geoip and geoip6 to the January 5 2018 database.
2018-01-08 11:36:38 +01:00
Roger Dingledine
40cd992abb
avoid calling format_iso_time() with TIME_MAX
...
If we tried to move a descriptor from routerlist->old_routers
back into the current routerlist, we were preparing a buffer with
format_iso_time() on ri->cert_expiration_time, and doing it preemptively
since router_add_to_routerlist() might free ri so we wouldn't be able
to get at it later in the function.
But if the descriptor we're moving doesn't have any ed signature, then
its cert will be marked to expire at TIME_MAX, and handing TIME_MAX
to format_iso_time() generates this log warning:
correct_tm(): Bug: gmtime(9223372036854775807) failed with error Value too large for defined data type: Rounding down to 2037
The fix is to preemptively remember the expiry time, but only prepare
the buffer if we know we're going to need it.
Bugfix on commit a1b0a0b9
, which came about as part of a fix for bug
20020, and which is not yet in any released version of Tor (hence no
changes file).
2018-01-07 02:15:18 -05:00
Roger Dingledine
44aa1adf35
make a comment a bit more useful
2018-01-06 15:03:35 -05:00
Roger Dingledine
94ec5af5fe
whitespace and typo fixes
2018-01-06 15:02:12 -05:00
Roger Dingledine
4f83d6d6ad
Merge branch 'maint-0.3.2'
2018-01-05 18:44:08 -05:00
Roger Dingledine
5f2c7a8567
remove redundant "implement this" from log message
2018-01-05 18:23:07 -05:00
Nick Mathewson
143da73165
Merge remote-tracking branch 'teor/fallback-code-2018-01'
2018-01-05 16:47:28 -05:00
Nick Mathewson
0b6fe3c123
Merge branch 'maint-0.3.2'
2018-01-05 16:41:35 -05:00
Nick Mathewson
48d94e290d
Merge branch 'maint-0.3.0' into maint-0.3.1
2018-01-05 16:41:34 -05:00
Nick Mathewson
16fd975a82
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-05 16:41:34 -05:00