Nick Mathewson
77026f8a87
Merge branch 'bug22798_029_squashed'
2018-01-17 13:26:41 -05:00
Nick Mathewson
959af20247
Merge branch 'maint-0.3.2'
2018-01-17 11:13:18 -05:00
Nick Mathewson
4e653ac2ca
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-01-17 11:12:15 -05:00
Nick Mathewson
86aa7f0a3f
Merge branch 'maint-0.3.2'
2018-01-17 10:50:58 -05:00
Nick Mathewson
57eab23ea5
update comment; ignore argument on non-win
2018-01-17 10:40:00 -05:00
Nick Mathewson
1efb84215e
Improve Windows performance with SIO_IDEAL_SEND_BACKLOG_QUERY.
...
Patch written by "Vort" on trac. Addresses ticket 22798.
2018-01-17 10:40:00 -05:00
Nick Mathewson
60dfdd9b15
Merge branch 'bug21074_029'
2018-01-17 09:07:50 -05:00
Nick Mathewson
0bfd5a6597
Add a cast to avoid a signed/unsigned comparison
2018-01-17 09:06:32 -05:00
Nick Mathewson
454d854363
Merge branch 'bug21074_029'
2018-01-16 14:13:39 -05:00
Nick Mathewson
01adeb2471
Merge branch 'stack_em_up'
2018-01-16 13:31:29 -05:00
Nick Mathewson
d8c1c70d7a
Repair a crash bug in src/test/bench
...
This was caused because of the new KeyDirectory and CacheDirectory
options not being set. Bugfix on 0.3.3.0-alpha; not in any released
Tor.
2018-01-16 13:29:11 -05:00
Nick Mathewson
6b2e856122
Fix a (spurious) scan-build warning in test_introduce1_validation()
...
Since helper_create_introduce1_cell() checks "cell" for nullness,
scan-build is concerned that test_introduce1_validation()
dereferences it without checking it. So, add a check.
Not backporting, since this is spurious, _and_ tests-only.
2018-01-16 08:36:34 -05:00
Roger Dingledine
af8cadf3a9
Remove false positives from channel_is_client()
...
Fix a set of false positives where relays would consider connections
to other relays as being client-only connections (and thus e.g.
deserving different link padding schemes) if those relays fell out
of the consensus briefly.
Now we look only at the initial handshake and whether the connection
authenticated as a relay.
Fixes bug 24898; bugfix on 0.3.1.1-alpha.
2018-01-15 22:33:40 -05:00
Roger Dingledine
7ce335c921
v3 onion services now obey MAX_REND_FAILURES
...
New-style (v3) onion services now obey the "max rendezvous circuit
attempts" logic.
Previously they would make as many rendezvous circuit attempts as they
could fit in the MAX_REND_TIMEOUT second window before giving up.
Fixes bug 24894; bugfix on 0.3.2.1-alpha.
2018-01-15 16:41:47 -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
.
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com>
2018-01-12 17:44:30 +01:00
Nick Mathewson
4c651b8c04
Note contactinfo and myfamily as required in more places
...
Includes a sentence from cypherpunks; for ticket 24526.
2018-01-11 20:00:18 -05:00
Nick Mathewson
a3d1c38ea6
Merge branch 'bug24582'
2018-01-11 19:57:57 -05: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
34c6034aa7
Increment version to 0.3.2.9-dev
2018-01-09 10:12:25 -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
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
b85fa0bd5f
Merge branch 'maint-0.2.9' into maint-0.3.0
2018-01-08 11:10:36 -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