torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
27,374 Commits 53 Branches 631 Tags
e8bd806412dc92054ebf7bffe6c604fef511fdbd
Commit Graph

27374 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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 1c5c5f0e50 Merge branch 'maint-0.3.1' into maint-0.3.2 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 b85fa0bd5f Merge branch 'maint-0.2.9' into maint-0.3.0 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
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
Nick Mathewson 3618bd6166 Merge branch 'maint-0.3.1' into maint-0.3.2 2018-01-05 16:41:34 -05:00
Nick Mathewson c52d4d9e34 Merge branch 'teor_ticket24681_028' into maint-0.2.9 2018-01-05 16:41:31 -05:00
Nick Mathewson 94d5523c7f fix a wide line 2018-01-05 11:28:23 -05:00
Nick Mathewson 2d92f4c19a Don't keep options in a local in run_main_loop_once. 
The options value can change between the get_options() and its
second use, based on setconf callbacks in the event loop.
 2018-01-05 09:24:34 -05:00
teor 65520f1bde Stop logging excessive information about fallback netblocks 
Implements ticket 24791
 2018-01-05 13:28:17 +11:00
teor d30d3fe8ed Adjust fallback selection parameters 
Avoid selecting fallbacks that change their IP addresses too often.

Select more fallbacks by ignoring the Guard flag, and allowing lower
cutoffs for the Running and V2Dir flags. Also allow a lower bandwidth,
and a higher number of fallbacks per operator (5% of the list).

Implements ticket 24785.
 2018-01-05 13:28:13 +11:00
teor befcc56d84 Update dependency list for the fallback script 
Comment-only change.

Implements #24711.
 2018-01-05 13:28:09 +11:00
teor 91a8b37a2e Make updateFallbackDirs.py search harder for python 
(Some OSs don't put it in /usr/bin.)

Fixes bug 24708; bugfix on 0.2.8.1-alpha.
 2018-01-05 13:28:05 +11:00
teor 2ae33e486e Revise the generateFallbackDirLine.py script to use descriptors 
Patch by atagar, part of #24706.
 2018-01-05 13:28:01 +11:00
teor e244738bbd Add fallback directory mirror helper scripts 
Add the generateFallbackDirLine.py script for automatically generating
fallback directory mirror lines from relay fingerprints. No more typos!

Add the lookupFallbackDirContact.py script for automatically looking up
operator contact info from relay fingerprints.

Implements ticket 24706.
 2018-01-05 13:27:55 +11:00