Nick Mathewson
a86324d1fa
Remove a needless changefile. (Needless because bug not released.)
2018-01-12 13:30:06 -05:00
Nick Mathewson
edc87b263f
Merge remote-tracking branch 'ffmancera/bug24861'
2018-01-12 13:29:53 -05:00
Fernando Fernandez Mancera
06368e5310
Fix minGW compatibility issue with zu format specifier.
...
Define TOR_PRIuSZ as minGW compiler doesn't support zu format specifier for
size_t type.
Fixes #24861 on ac9eebd
2018-01-12 17:44:30 +01:00
Nick Mathewson
a3d1c38ea6
Merge branch 'bug24582'
2018-01-11 19:57:57 -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
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
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
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
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
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
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
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
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
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
teor
b6033f5734
Add a delimiter to the end of each fallback entry
...
This helps external parsers.
Also, add comments indicating where to add new fields in the fallback
format.
Part of 24725.
2018-01-05 13:27:32 +11:00
teor
beedf5fd81
Remove commas and equals signs from external string inputs to the fallback list
...
This makes sure that list parsers only see one comma per fallback entry,
and only see one equals sign per field.
Implements ticket 24726.
2018-01-05 13:27:22 +11:00
teor
6a27fc6245
Add an extrainfo cache flag for each fallback in a C comment
...
This allows stem to use fallbacks to fetch extra-info documents,
rather than using authorities.
Implements ticket 22759.
2018-01-05 13:27:14 +11:00
teor
561f18e724
Add a nickname to each fallback in a C comment
...
This makes it easier for operators to find their relays, and allows stem to
use nicknames to identify fallbacks.
Implements ticket 24600.
2018-01-05 13:27:07 +11:00
teor
ac5058ac8a
Remove the "weight=10" line from fallback directory mirror entries
...
This removes some redundant repeated lines.
Ticket 24681 will maintain the current fallback weights by changing
Tor's default fallback weight to 10.
Implements ticket 24679.
2018-01-05 13:26:53 +11:00
teor
8d226a2c7b
Add a type and version header to the fallback directory mirror file
...
This helps external parsers like stem and Relay Search.
Implements ticket 24725.
2018-01-05 13:26:44 +11:00
teor
e3a2324083
Add a changes file for 22321, that mentions all its children and 24678
2018-01-05 13:26:38 +11:00
teor
9a0cf2376d
Update comment and add changes file for 20942
2018-01-05 13:26:14 +11:00
Nick Mathewson
943134e886
Merge remote-tracking branch 'pastly2/ticket24531_033_01'
2018-01-03 11:56:35 -05:00
Nick Mathewson
6b3c07648c
Merge branch 'maint-0.3.2'
2018-01-03 10:09:20 -05:00
Nick Mathewson
1bc95633fb
Fix some shadowed-global warnings.
...
These are all about local variables shadowing global
functions. That isn't normally a problem, but at least one
compiler we care about seems to treat this as a case of -Wshadow
violation, so let's fix it.
Fixes bug 24634; bugfix on 0.3.2.1-alpha.
2018-01-03 09:13:00 -05:00
Nick Mathewson
b62b40a572
Merge branch 'maint-0.3.2'
2018-01-03 09:00:00 -05:00
Nick Mathewson
451c852a0f
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-01-03 09:00:00 -05:00
