sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
24,857 Commits 31 Branches 486 Tags 66 MiB
Commit Graph

24857 Commits

Author SHA1 Message Date
Nick Mathewson 2e21493a88 add missing subcategory in changes file 2017-10-05 11:04:54 -04:00
Nick Mathewson 87b2047f9e Merge branch 'maint-0.3.0' into release-0.3.0 2017-10-05 11:03:36 -04:00
Nick Mathewson d6bdec1595 Merge branch 'maint-0.2.5' into maint-0.2.8 2017-10-05 11:03:35 -04:00
Nick Mathewson ad7db10770 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-10-05 11:03:35 -04:00
Nick Mathewson 2984d99165 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-10-05 11:03:35 -04:00
Karsten Loesing b9d9b16b76 Update geoip and geoip6 to the October 4 2017 database. 2017-10-05 16:56:14 +02:00
Nick Mathewson c50c98ba6a Make changes in server_mode() affect workers; fix a crash. 
Without this fix, changes from client to bridge don't trigger
transition_affects_workers(), so we would never have actually
initialized the cpuworkers.

Fixes bug 23693.  Bugfix on 3bcdb26267 0.2.6.3-alpha, which
fixed bug 14901 in the general case, but not on the case where
public_server_mode() did not change.
 2017-10-02 11:11:30 -04:00
Nick Mathewson f7222e6d8c Clear outbuf_flushlen when we clear a connection's outbuf 
When we added single_conn_free_bytes(), we cleared the outbuf on a
connection without setting outbuf_flushlen() to 0.  This could cause
an assertion failure later on in flush_buf().

Fixes bug 23690; bugfix on 0.2.6.1-alpha.
 2017-09-29 10:00:14 -04:00
Nick Mathewson d256d4c0a6 Don't package cells onto marked circuits. 
This caused a BUG log when we noticed that the circuit had no
channel.  The likeliest culprit for exposing that behavior is
d769cab3e5, where we made circuit_mark_for_close() NULL out
the n_chan and p_chan fields of the circuit.

Fixes bug 8185; bugfix on 0.2.5.4-alpha, I think.
 2017-09-29 09:33:47 -04:00
Nick Mathewson 5df265ae55 Merge branch 'maint-0.3.0' into release-0.3.0 2017-09-22 09:09:17 -04:00
David Goulet dc5c9af6c3 hs: Avoid possible double circuit close on error 
Fixes #23610

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2017-09-22 09:09:13 -04:00
Nick Mathewson 2c93be80d9 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-09-20 08:32:55 -04:00
Nick Mathewson 2db94810bf Merge branch 'maint-0.3.0' into release-0.3.0 2017-09-20 08:32:55 -04:00
Nick Mathewson 746410fb24 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-09-20 08:32:55 -04:00
teor 8e52c46581
Remove longclaw's IPv6 address, as it will soon change 
Authority IPv6 addresses were originally added in 0.2.8.1-alpha.

This leaves 3/8 directory authorities with IPv6 addresses, but there
are also 52 fallback directory mirrors with IPv6 addresses.

Resolves 19760.
 2017-09-20 14:48:53 +10:00
Nick Mathewson b594455ddd Merge branch 'maint-0.3.0' into release-0.3.0 2017-09-18 14:40:55 -04:00
Nick Mathewson 23c5259a38 Merge branch 'maint-0.2.9' into maint-0.3.0 
"ours" to avoid version bump.
 2017-09-18 14:40:36 -04:00
Nick Mathewson 42e12a3537 Merge branch 'maint-0.2.8' into maint-0.2.9 
"ours" to avoid version bump.
 2017-09-18 14:40:22 -04:00
Nick Mathewson e78347fcc2 bump to 0.3.0.11-dev 2017-09-18 14:39:55 -04:00
Nick Mathewson a57f1ff7ab bump to 0.2.9.12-dev 2017-09-18 14:39:46 -04:00
Nick Mathewson 0a72d1c8f1 bump to 0.2.8.15-dev 2017-09-18 14:39:40 -04:00
Nick Mathewson 5cb83c9425 finish changelog for 0.3.0.11 2017-09-18 09:56:54 -04:00
Nick Mathewson 139bda4fe4 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-09-18 09:40:40 -04:00
Nick Mathewson d9bc1cdd1c Merge branch 'maint-0.3.0' into release-0.3.0 2017-09-18 09:40:40 -04:00
Nick Mathewson 9d8d4cb3fa Merge branch 'trove-2017-008_030' into maint-0.3.0 2017-09-18 09:40:36 -04:00
Nick Mathewson 7df7908905 Merge branch 'maint-0.2.8' into maint-0.3.0 
This is an "ours" merge to avoid the conflict from the 0.2.8 version
of the fix for TROVE-2017-008.
 2017-09-18 09:40:09 -04:00
Nick Mathewson 314652dc16 Merge branch 'maint-0.2.8' into maint-0.2.9 2017-09-18 09:39:46 -04:00
Nick Mathewson 0ec72b0308 Merge branch 'trove-2017-008_028' into maint-0.2.8 2017-09-18 09:39:35 -04:00
Nick Mathewson 09ea89764a Fix log-uninitialized-stack bug in rend_service_intro_established. 
Fixes bug 23490; bugfix on 0.2.7.2-alpha.

TROVE-2017-008
CVE-2017-0380
 2017-09-18 09:32:41 -04:00
Nick Mathewson 4a2cbea6ce Fix log-uninitialized-stack bug in rend_service_intro_established. 
Fixes bug 23490; bugfix on 0.2.7.2-alpha.

TROVE-2017-008
CVE-2017-0380
 2017-09-18 09:27:07 -04:00
Nick Mathewson 881307dc77 Merge branch 'maint-0.3.0' into release-0.3.0 2017-09-14 13:22:17 -04:00
Nick Mathewson e468498469 Merge branch 'maint-0.2.9' into maint-0.3.0 
"ours" merge to avoid version bump.
 2017-09-14 13:21:52 -04:00
Nick Mathewson f7b06202c7 Merge branch 'maint-0.2.8' into maint-0.2.9 
"ours" merge to avoid version bump.
 2017-09-14 13:21:28 -04:00
Nick Mathewson 348b225bd8 version bump: 0.3.0.11 2017-09-14 13:20:52 -04:00
Nick Mathewson 3c6d4fe046 version bump: 0.2.9.12 2017-09-14 13:20:29 -04:00
Nick Mathewson 26f68dfcef version bump: 0.2.8.15 2017-09-14 13:20:14 -04:00
Nick Mathewson eebf93dfdc Start changelog for 0.3.0.11 2017-09-14 13:03:37 -04:00
Nick Mathewson 61f3fe0418 Merge branch 'maint-0.3.0' into release-0.3.0 2017-09-14 10:15:38 -04:00
Martin Kepplinger a971018f6d entrynodes.c: fix syntax error around BUG() statement 
Fix those misplaced brackets.

Signed-off-by: Martin Kepplinger <martink@posteo.de>
 2017-09-14 10:14:44 -04:00
teor c86013291b
Stop relays calling directory_fetches_from_authorities on dir downloads 
This change refactors find_dl_schedule() to only call dependent functions
as needed. In particular, directory_fetches_from_authorities() only needs
to be called on clients.

Stopping spurious directory_fetches_from_authorities() calls on every
download on public relays has the following impacts:
* fewer address resolution attempts, particularly those mentioned in 21789
* fewer descriptor rebuilds
* fewer log messages, particularly those limited in 20610

Fixes 23470 in 0.2.8.1-alpha.
The original bug was introduced in commit 35bbf2e as part of prop210.
 2017-09-13 09:46:17 +10:00
Nick Mathewson fdcb065bf7 Merge branch 'maint-0.3.0' into release-0.3.0 2017-09-12 17:09:47 -04:00
Nick Mathewson dedafe95fe Merge branch 'maint-0.2.9' into maint-0.3.0 2017-09-12 17:09:47 -04:00
Nick Mathewson 3138fe2e69 Merge branch 'bug15582_029' into maint-0.2.9 2017-09-12 17:09:42 -04:00
Nick Mathewson d9e2db1efd Avoid sscanf() warnings from openbsd in the unit tests 
OpenBSD doesn't like tricks where you use a too-wide sscanf argument
for a too-narrow array, even when you know the input string
statically.  The fix here is just to use bigger buffers.

Fixes 15582; bugfix on a3dafd3f58 in 0.2.6.2-alpha.
 2017-09-12 16:01:12 -04:00
Nick Mathewson 070e82a02d Merge branch 'maint-0.3.0' into release-0.3.0 2017-09-12 09:23:57 -04:00
Nick Mathewson 0729ba2868 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-09-12 09:23:57 -04:00
Nick Mathewson bac160b4e0 One more implicit fallthrough warning to fix on GCC 7 2017-09-12 09:22:50 -04:00
Nick Mathewson 9c8b07c5eb Merge branch 'maint-0.3.0' into release-0.3.0 2017-09-11 17:49:18 -04:00
Nick Mathewson 2b26815e09 Merge branch 'maint-0.2.9' into maint-0.3.0 2017-09-11 17:49:18 -04:00
Andreas Stieger 6cd5a80275 Fix GCC 7 -Wimplicit-fallthrough warnings 
Add magic comments recognized by default -Wimplicit-fallthrough=3
or break, as required.
 2017-09-11 17:47:04 -04:00