Nick Mathewson
411c622906
Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4
2014-05-07 23:11:32 -04:00
Nick Mathewson
14bc6e8993
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
Conflicts:
src/or/microdesc.c
2014-05-01 11:44:25 -04:00
Nick Mathewson
6a4f5d9b4d
Downgrade bug 7164 warning to INFO
...
The 0.2.5.x warning is the one that might help us track this down; the
warnings in stable are just annoying users over and over and over.
2014-05-01 11:42:02 -04:00
Nick Mathewson
efab3484e6
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-04-30 20:25:15 -04:00
Nick Mathewson
8828794dc2
Merge remote-tracking branch 'public/bug10849_023_bruteforce' into maint-0.2.3
2014-04-30 20:23:22 -04:00
Nick Mathewson
35699ef9f5
Drop the MaxMemInCellQueues lower limit down to 256 MB.
...
on #9686 , gmorehose reports that the 500 MB lower limit is too high
for raspberry pi users.
This is a backport of 647248729f
to 0.2.4.
Note that in 0.2.4, the option is called MaxMemInCellQueues.
2014-04-29 20:48:22 -04:00
Nick Mathewson
1d3ffc0ec9
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-04-29 13:02:18 -04:00
Nick Mathewson
65575b0755
Stop leaking memory in error cases of md parsing
...
When clearing a list of tokens, it's important to do token_clear()
on them first, or else any keys they contain will leak. This didn't
leak memory on any of the successful microdescriptor parsing paths,
but it does leak on some failing paths when the failure happens
during tokenization.
Fixes bug 11618; bugfix on 0.2.2.6-alpha.
2014-04-29 13:00:00 -04:00
Nick Mathewson
f8248abbd6
Forbid TunneledDirConns 0 and PreferTunneledDirConns 0 if being a HS
...
Fixes bug 10849; bugfix on 0.2.1.1-alpha (I believe)
2014-04-25 14:24:41 -04:00
Nick Mathewson
9e44df2c98
Merge remote-tracking branch 'public/bug9229_024' into maint-0.2.4
2014-04-23 11:01:39 -04:00
Nick Mathewson
bb9b4c37f8
Supply better and less frequent warnings on circID exhaustion
...
Fixes the surface behavior of #11553
2014-04-18 12:31:06 -04:00
Nick Mathewson
3fc0f9efb8
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-04-16 14:57:14 -04:00
Nick Mathewson
ef3d7f2f97
remove note about dannenberg; it has upgraded.
2014-04-16 14:56:49 -04:00
Nick Mathewson
f050cf75b0
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2014-04-16 13:32:20 -04:00
Nick Mathewson
2ce0750d21
Update the authority signing key blacklist
...
Now it only has dannenberg
2014-04-16 13:31:40 -04:00
Nick Mathewson
f3c20a28ab
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
Conflicts:
src/or/circuituse.c
2014-04-15 14:51:19 -04:00
Nick Mathewson
b2106956e0
Don't send uninitialized stack to the controller and say it's a date.
...
Fixes bug 11519, apparently bugfix on 0.2.3.11-alpha.
2014-04-14 21:51:30 -04:00
Nick Mathewson
149931571a
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
Conflicts:
src/or/routerlist.h
2014-04-14 18:00:38 -04:00
Nick Mathewson
09ed8a5dbb
Tweak changes file and comment dates.
2014-04-14 17:58:49 -04:00
Nick Mathewson
46cf63bb42
Fill in the list of blacklisted signing keys.
...
I used a list of certificate files from arma, and a little script,
both at 11464.
2014-04-14 17:57:39 -04:00
Nick Mathewson
50ad393924
Code to blacklist authority signing keys
...
(I need a list of actual signing keys to blacklist.)
2014-04-14 17:57:39 -04:00
Nick Mathewson
ab1a679eef
Fix a small memory leak when resolving PTR addresses
...
Fixes bug 11437; bugfix on 0.2.4.7-alpha.
Found by coverity; this is CID 1198198.
2014-04-07 23:29:47 -04:00
Nick Mathewson
24e0b1088a
whitespace fix
2014-03-27 15:34:57 -04:00
Nick Mathewson
9077118ee2
Remove the unused router_hex_digest_matches
...
When I removed some unused functions in 5bfa373eee
, this became
unused as well.
2014-03-11 11:17:46 -04:00
Nick Mathewson
db72479eea
Update ns downloads when we receive a bridge descriptor
...
This prevents long stalls when we're starting with a state file but
with no bridge descriptors. Fixes bug 9229. I believe this bug has
been present since 0.2.0.3-alpha.
2014-03-10 15:01:27 -04:00
Nick Mathewson
cbf9e74236
Correct the URL in the "a relay on win95???" message
...
This is a fix for 9393; it's not a bugfix on any Tor version per se,
but rather on whatever Tor version was current when we reorganized the
wiki.
2014-03-06 09:57:42 -05:00
Nick Mathewson
c3800f631b
Merge remote-tracking branch 'public/no_itime_queue' into maint-0.2.4
2014-02-25 15:58:53 -05:00
Nick Mathewson
d21b24b3b6
Merge remote-tracking branch 'public/feature9777_024_squashed' into maint-0.2.4
2014-02-24 13:05:25 -05:00
Nick Mathewson
d6e6eaba60
Fix windows compilation of e0c8031516
...
There is no WSAEPERM; we were implying that there was.This fixes a
bug in e0c8031516
, which hadn't yet
appeared in any released Tor.
2014-02-12 09:16:22 -05:00
Nick Mathewson
91d4bb0b00
Merge branch 'bug10777_netunreach_024' into maint-0.2.4
2014-02-11 18:57:55 -05:00
Nick Mathewson
8836c1ee2f
Merge remote-tracking branch 'public/bug10777_nointernal_024' into maint-0.2.4
2014-02-11 18:55:26 -05:00
Nick Mathewson
e0c8031516
make EACCES survivable too.
2014-02-10 15:06:10 -05:00
Nick Mathewson
3133cde3c1
Excise the insertion_time_elem_t logic
...
It's now redundant with the inserted_time field in packed_cell_t
Fixes bug 10870.
2014-02-10 13:55:27 -05:00
Nick Mathewson
b15f75b632
Don't treat END_STREAM_REASON_INTERNAL as total circuit failure
...
It can happen because we sent something that got an ENETUNREACH
response.
Bugfix on 0.2.4.8-alpha; fixes a part of bug 10777.
2014-02-09 21:35:14 -05:00
Nick Mathewson
f5d32c08ba
Call ENETUNREACH a case of NOROUTE, not a case of INTERNAL.
...
Found by cypherpunks; fix for a part of bug 10777; bugfix on 0.1.0.1-rc.
2014-02-09 21:30:23 -05:00
Andrea Shepard
c330d63ff7
Make sure orconn->chan gets nulled out when channels exit from channel_free_all() too
2014-02-08 14:05:51 -08:00
Nick Mathewson
1068e50aec
Discard circuit paths on which nobody supports ntor
...
Right now this accounts for about 1% of circuits over all, but if you
pick a guard that's running 0.2.3, it will be about 6% of the circuits
running through that guard.
Making sure that every circuit has at least one ntor link means that
we're getting plausibly good forward secrecy on every circuit.
This implements ticket 9777,
2014-02-07 10:45:34 -05:00
Andrea Shepard
707c1e2e26
NULL out conns on tlschans when freeing in case channel_run_cleanup() is late; fixes bug 9602
2014-02-06 14:47:34 -08:00
Nick Mathewson
b4e8d8dc0e
Merge remote-tracking branch 'public/bug9716_024' into maint-0.2.4
2014-02-06 16:29:08 -05:00
Nick Mathewson
655adbf667
Add a missing include
2014-02-06 13:25:36 -05:00
Nick Mathewson
edc6fa2570
Deliver circuit handshake counts as part of the heartbeat
...
Previously, they went out once an hour, unconditionally.
Fixes 10485; bugfix on 0.2.4.17-rc.
2014-02-06 13:03:01 -05:00
Nick Mathewson
b9f6e40ecb
Fix automapping to ipv6
...
Bugfix on 0.2.4.7-alpha; fixes bug 10465.
2013-12-22 17:19:22 -05:00
Nick Mathewson
b5d13d11c9
Fix a logic error in circuit_stream_is_being_handled.
...
When I introduced the unusable_for_new_circuits flag in
62fb209d83
, I had a spurious ! in the
circuit_stream_is_being_handled loop. This made us decide that
non-unusable circuits (that is, usable ones) were the ones to avoid,
and caused it to launch a bunch of extra circuits.
Fixes bug 10456; bugfix on 0.2.4.12-alpha.
2013-12-21 10:15:09 -05:00
Nick Mathewson
561d9880f8
Merge branch 'bug10423' into maint-0.2.4
2013-12-17 13:53:11 -05:00
Nick Mathewson
3d5154550c
Merge remote-tracking branch 'public/bug10409_023' into maint-0.2.4
2013-12-17 13:15:45 -05:00
Nick Mathewson
46b3b6208d
Avoid double-free on failure to dump_descriptor() a cached md
...
This is a fix for 10423, which was introducd in caa0d15c
in 0.2.4.13-alpha.
Spotted by bobnomnom.
2013-12-17 13:12:52 -05:00
Nick Mathewson
d8cfa2ef4e
Avoid free()ing from an mmap on corrupted microdesc cache
...
The 'body' field of a microdesc_t holds a strdup()'d value if the
microdesc's saved_location field is SAVED_IN_JOURNAL or
SAVED_NOWHERE, and holds a pointer to the middle of an mmap if the
microdesc is SAVED_IN_CACHE. But we weren't setting that field
until a while after we parsed the microdescriptor, which left an
interval where microdesc_free() would try to free() the middle of
the mmap().
This patch also includes a regression test.
This is a fix for #10409 ; bugfix on 0.2.2.6-alpha.
2013-12-16 13:06:00 -05:00
Nick Mathewson
59f50c80d4
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
Conflicts:
src/or/or.h
src/or/relay.c
Conflicts were simple to resolve. More fixes were needed for
compilation, including: reinstating the tv_to_msec function, and renaming
*_conn_cells to *_chan_cells.
2013-11-15 15:29:24 -05:00
Nick Mathewson
8bfa596c15
Fix two more DirServer mentions in log
2013-11-10 12:23:56 -05:00
Nick Mathewson
56ac75b265
Fix a wide line
2013-11-10 12:22:34 -05:00