Nick Mathewson
7bdbcdaed8
Merge commit '7b859fd8c558c9cf08add79db87fb1cb76537535'
2015-11-13 08:42:20 -05:00
Nick Mathewson
f7ccc9b975
Merge branch 'decouple_circuit_mark_squashed'
2015-11-12 14:20:24 -05:00
Nick Mathewson
8b4e5b7ee9
Experimentally decouple the main body of circuit_mark_for_close
2015-11-12 14:20:16 -05:00
Nick Mathewson
d20a3d07e3
Merge branch 'karsten_bug13192_026_03_teor'
2015-11-12 11:40:58 -05:00
Nick Mathewson
0a3eed5f20
Merge branch 'bug17549'
2015-11-10 10:40:31 -05:00
teor (Tim Wilson-Brown)
0d5a439292
Mark fallback directoriess as too busy after a 503 response
...
Mark fallback directory mirrors as "too busy" when they return
a 503 response. Previously, the code just marked authorities as busy.
Unless clients set their own fallback directories, they will never see
this bug. (There are no default fallbacks yet.)
Fixes bug 17572; bugfix on 5c51b3f1f0
released in 0.2.4.7-alpha.
Patch by "teor".
2015-11-10 09:47:48 +11:00
Yawning Angel
3e3ec750cd
Fix compilation with OpenSSL 1.1.0-dev.
...
OpenSSL changed the API:
* 5998e29035
* b0700d2c8d
2015-11-06 19:02:56 +00:00
Yawning Angel
b71f6d6a47
Fix SipHash-2-4 performance for non multiple of 8 buffers.
...
Code cribbed from Andrew Moon's Public Domain SipHash-2-4
implementation (which IMO is also cleaner).
Fixes bug 17544.
2015-11-05 18:21:43 +00:00
Nick Mathewson
faba114a34
remove changes files that have been used in existing changelogs
2015-10-31 14:44:34 -04:00
Nick Mathewson
c1c1c4d057
Refer to the actual minima and the preferred minimum
2015-10-30 10:57:47 -04:00
Nick Mathewson
1385ab0605
Merge remote-tracking branch 'rl1987/ticket16831_part2_rebased'
2015-10-30 09:59:11 -04:00
rl1987
3c08b76fc4
Mention torspec URL in the manpage.
2015-10-30 09:25:39 -04:00
rl1987
6d8952fae0
Adding changes file.
2015-10-24 14:30:53 +03:00
Nick Mathewson
7b859fd8c5
Note that you can use a unix domain socket for hsport
2015-10-21 12:22:05 -04:00
Nick Mathewson
895a98dbaf
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-10-21 11:53:00 -04:00
Nick Mathewson
b809c265e7
Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.7
2015-10-21 11:51:03 -04:00
Nick Mathewson
35bf07b8d6
Check for len < 4 in dn_indicates_v3_cert
...
Without this check, we potentially look up to 3 characters before
the start of a malloc'd segment, which could provoke a crash under
certain (weird afaik) circumstances.
Fixes 17404; bugfix on 0.2.6.3-alpha.
2015-10-21 11:44:43 -04:00
Nick Mathewson
52fd384a46
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-10-21 11:18:11 -04:00
Nick Mathewson
9c4a0aef0c
Fix a memory leak in reading an expired ed signing key.
...
Closes 17403.
2015-10-21 11:16:28 -04:00
Nick Mathewson
d14b009b23
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-10-21 10:54:12 -04:00
Nick Mathewson
aa96abe66b
Fix memory leak in rend_cache_failure_entry_free()
...
Bug 17402.
2015-10-21 10:52:57 -04:00
Nick Mathewson
46cd466dec
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-10-21 10:00:52 -04:00
Nick Mathewson
5b2070198a
Fix a use-after-free in validate_intro_point_failure. Bug 17401. Found w valgrind
2015-10-21 09:59:19 -04:00
Nick Mathewson
2461ea1faa
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-10-21 08:17:34 -04:00
Nick Mathewson
542cc8a5ff
Fix a memory leak; bug 17398.
2015-10-21 08:17:07 -04:00
Nick Mathewson
be26c88757
Merge commit '551af4f97d37c7b4cff7a8557c1a1a647487b4cb'
2015-10-19 11:20:26 -04:00
Nick Mathewson
551af4f97d
tweak some changes files
2015-10-19 11:12:43 -04:00
Nick Mathewson
a8a26ca30e
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-10-15 13:56:53 -04:00
Nick Mathewson
7e7683b254
Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7
2015-10-15 13:56:41 -04:00
David Goulet
2ec5e24c58
Add hidserv-stats filname to our sandbox filter
...
Fixes #17354
Signed-off-by: David Goulet <dgoulet@ev0ke.net>
2015-10-15 13:42:34 -04:00
Nick Mathewson
a5ed8b1667
Fix compilation of sandbox.[ch] under musl-libc
...
Patch from jamestk; fix on 0.2.5.1-alpha. Fixes 17347.
2015-10-15 10:37:41 -04:00
Nick Mathewson
fa4a81518a
Merge branch 'bug17347'
2015-10-15 10:36:29 -04:00
Nick Mathewson
50148dc45d
Fix compilation of sandbox.[ch] under musl-libc
...
Patch from jamestk; fix on 0.2.5.1-alpha. Fixes 17347.
2015-10-15 10:35:45 -04:00
Nick Mathewson
4da2f89f95
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-10-09 10:18:42 -04:00
Nick Mathewson
7c3f210e70
Merge remote-tracking branch 'origin/maint-0.2.6' into maint-0.2.7
2015-10-09 10:14:59 -04:00
Nick Mathewson
552136668c
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
2015-10-09 10:14:46 -04:00
Nick Mathewson
3569cffe14
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
2015-10-09 10:12:59 -04:00
Karsten Loesing
62b02a1941
Update geoip and geoip6 to the October 9 2015 database.
2015-10-09 15:27:55 +02:00
Nick Mathewson
cd14405a43
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-10-07 15:21:23 -04:00
teor (Tim Wilson-Brown)
c464a36772
Make get_ifaddrs tests more tolerant of unusual network configs
...
* Don't assume that every test box has an IPv4 address
* Don't assume that every test box has a non-local address
Resolves issue #17255 released in unit tests in 0.2.7.3-rc.
2015-10-07 15:20:31 -04:00
Nick Mathewson
4e34ef87a4
changes file for 17078
2015-10-07 09:34:49 -04:00
Nick Mathewson
aaa27b995c
changes file for #16563
2015-10-06 11:02:55 -04:00
Nick Mathewson
bfd9dccdb8
Merge remote-tracking branch 'origin/maint-0.2.7'
2015-10-06 09:06:57 -04:00
Nick Mathewson
1eb838b303
Work around openssl declaring x509_get_not{Before,After} as functions
...
Now that x509_get_not{Before,After} are functions in OpenSSL 1.1
(not yet releasesd), we need to define a variant that takes a const
pointer to X509 and returns a const pointer to ASN1_time.
Part of 17237. I'm not convinced this is an openssl bug or a tor
bug. It might be just one of those things.
2015-10-06 09:04:37 -04:00
Nick Mathewson
f7ce93d979
Fix 17251: avoid integer overflow in test_crypto_slow
2015-10-06 08:58:03 -04:00
Nick Mathewson
92c436ccbc
Fix warnings.
2015-10-02 15:12:04 +02:00
Nick Mathewson
7bd2247483
changes file for 17082
2015-10-02 14:35:16 +02:00
Nick Mathewson
67182226f1
Merge remote-tracking branch 'teor/warn-when-time-goes-backwards'
2015-10-02 13:56:28 +02:00
Nick Mathewson
488e9a0502
Merge remote-tracking branch 'teor/routerset-parse-IPv6-literals'
...
(Minor conflicts)
2015-10-02 13:54:20 +02:00
Nick Mathewson
0b3190d4b7
Merge remote-tracking branch 'donncha/feature14846_4'
2015-10-02 13:40:26 +02:00