Nick Mathewson
c7113e702b
Merge remote-tracking branch 'public/bug9645'
2013-09-05 09:59:07 -04:00
Roger Dingledine
86907ea4db
Merge branch 'maint-0.2.4'
2013-09-05 02:34:58 -04:00
Roger Dingledine
2c877d2da4
collect and log statistics about onionskins received/processed
...
we skip onionskins that came from non-relays, so we're less likely to
run into privacy troubles.
starts to implement ticket 9658.
2013-09-05 01:44:52 -04:00
Roger Dingledine
f51add6dbc
Revert e443beff
and solve it a different way
...
Now we explicitly check for overflow.
This approach seemed smarter than a cascade of "change int to unsigned
int and hope nothing breaks right before the release".
Nick, feel free to fix in a better way, maybe in master.
2013-09-05 01:41:07 -04:00
Roger Dingledine
e443beffeb
don't let recently_chosen_ntors overflow
...
with commit c6f1668d
we let it grow arbitrarily large.
it can still overflow, but the damage is very small now.
2013-09-05 01:27:46 -04:00
Roger Dingledine
6156887adf
Merge branch 'maint-0.2.4'
...
Conflicts:
src/test/test.c
2013-09-04 23:44:39 -04:00
Roger Dingledine
c6f1668db3
nickm wants us to prioritize tap in a currently-rare edge case
2013-09-04 23:21:46 -04:00
Roger Dingledine
71e0ca02b5
add a changes entry for ticket 9574
2013-09-04 23:21:46 -04:00
Roger Dingledine
a4400952ee
Be more general in calculating expected onion queue processing time
...
Now we consider the TAP cells we'll process while draining the NTor
queue, and vice versa.
2013-09-04 23:21:45 -04:00
Roger Dingledine
a66791230f
let the NumNTorsPerTAP consensus param override our queue choice
2013-09-04 23:21:45 -04:00
Roger Dingledine
7acc7c3dc6
do a lopsided round-robin between the onion queues
...
that way tap won't starve entirely, but we'll still handle ntor requests
quicker.
2013-09-04 23:21:45 -04:00
Roger Dingledine
16b5c609a4
check bounds on handshake_type more thoroughly
2013-09-04 23:21:45 -04:00
Roger Dingledine
9d2030e580
add info-level logs to help track onion queue sizes
2013-09-04 23:21:45 -04:00
Roger Dingledine
bb32bfa2f2
refactor and give it unit tests
2013-09-04 23:21:45 -04:00
Roger Dingledine
87a18514ef
Separate cpuworker queues by handshake type
...
Now we prioritize ntor create cells over tap create cells.
Starts to address ticket 9574.
2013-09-04 23:21:45 -04:00
Nick Mathewson
d5e9573ed2
Merge remote-tracking branch 'origin/maint-0.2.4'
...
Conflicts:
src/or/circuituse.c
2013-09-04 16:11:20 -04:00
Nick Mathewson
a60d21a85d
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
Conflicts:
src/or/circuitbuild.c
2013-09-04 16:08:02 -04:00
Nick Mathewson
3cebc5e73c
Merge branch 'bug9671_023' into maint-0.2.3
2013-09-04 16:04:47 -04:00
Nick Mathewson
4f3dbb3c0a
use !cbt_disabled in place of LearnCBT to avoid needless circs
...
This would make us do testing circuits "even when cbt is disabled by
consensus, or when we're a directory authority, or when we've failed
to write cbt history to our state file lately." (Roger's words.)
This is a fix for 9671 and an improvement in our fix for 5049.
The original misbehavior was in 0.2.2.14-alpha; the incomplete
fix was in 0.2.3.17-beta.
2013-09-04 15:54:05 -04:00
George Kadianakis
386e9fb297
Add Extended ORPort information to the man page.
2013-09-04 14:20:42 +03:00
Nick Mathewson
11352b0ce1
Add a clarification to gcov instructions
2013-09-03 15:44:13 -04:00
Nick Mathewson
9b2a0f5c75
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-09-03 15:41:50 -04:00
Nick Mathewson
a8e76de4d9
Merge branch 'bug9400_024_squashed' into maint-0.2.4
2013-09-03 15:38:54 -04:00
Nick Mathewson
d819663b66
Avoid a double-close on one failing case of the socketpair replacement code
...
Fix for bug 9400, spotted by coverity. Bug introduced in revision 2cb4f7a4
(subversion revision r389).
2013-09-03 15:38:25 -04:00
Nick Mathewson
264aa271a7
Fix bug 9645: don't forget an md just because we can't save it.
2013-09-03 14:25:01 -04:00
Nick Mathewson
5c9008e0b0
Fix some "ISO C90 forbids mixed declarations and code" warnings
2013-09-03 13:39:31 -04:00
Nick Mathewson
3753488011
Fix warnings in test_config_fix_my_family
2013-09-03 13:35:44 -04:00
Nick Mathewson
eb5f22eff2
Merge remote-tracking branch 'Ryman/bug4341'
2013-09-03 13:16:22 -04:00
Kevin Butler
db318dc77f
Minor changes to adhere to codebase conventions.
2013-09-03 17:47:03 +01:00
Nick Mathewson
824df4a08e
Merge remote-tracking branch 'public/bug2767'
2013-09-03 12:37:36 -04:00
Nick Mathewson
270b4f030a
Handle HTTP minor versions greater than 9
...
(In practice they don't exist, but so long as we're making changes for
standards compliance...)
Also add several more unit tests for good and bad URL types.
2013-09-03 11:38:15 -04:00
Kevin Butler
5327605caa
Tougher validation for parsing urls from HTTP headers. Fixes #2767 .
2013-09-03 01:14:43 +01:00
Kevin Butler
77e4a01f12
Updated openssl configuration advice for Debian
2013-09-02 19:54:50 +01:00
Kevin Butler
bb69bf8882
Changed signature for check_nickname_list to remove warnings on free.
2013-08-31 05:14:48 +01:00
Kevin Butler
0513643317
MyFamily option will now fix fingerprints missing their leading instead of complaining. Should fix #4341 .
2013-08-31 04:49:04 +01:00
Nick Mathewson
00bcc25d05
Cleanup whitespaces
2013-08-25 12:22:20 -04:00
Nick Mathewson
3417939565
Merge branch 'bug5609_rebased'
2013-08-25 11:32:55 -04:00
Nick Mathewson
078d6bcda5
Basic unit test for EVENT_TRANSPORT_LAUNCHED
2013-08-25 11:29:03 -04:00
Nick Mathewson
69312c7a84
Widen event_mask_t to 64 bits
2013-08-25 10:46:53 -04:00
George Kadianakis
907711d790
Add a changes file for #5609 .
2013-08-25 10:37:03 -04:00
George Kadianakis
6dd462e8bc
Implement the TRANSPORT_LAUNCHED control port event.
2013-08-25 10:37:03 -04:00
Nick Mathewson
2452302354
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-08-25 00:34:23 -04:00
Nick Mathewson
a5610cfa64
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
...
(Using "ours" strategy to avoid taking 9546 fix in 0.2.3; we just
merged our own into 0.2.4)
2013-08-25 00:33:10 -04:00
Nick Mathewson
8611195a00
Merge remote-tracking branch 'public/bug9546_023_v2' into maint-0.2.3
2013-08-25 00:32:27 -04:00
Nick Mathewson
4107ddd003
Merge remote-tracking branch 'public/bug9546_v2' into maint-0.2.4
2013-08-25 00:31:51 -04:00
Nick Mathewson
1ee1c8fb4f
Merge remote-tracking branch 'public/bug9366' into maint-0.2.4
2013-08-25 00:29:49 -04:00
Nick Mathewson
3727a978b8
Merge remote-tracking branch 'public/bug9543' into maint-0.2.4
2013-08-25 00:29:06 -04:00
Roger Dingledine
0fd8f5781b
fix typos
2013-08-23 21:43:57 -04:00
Nick Mathewson
223c7da080
Merge remote-tracking branch 'origin/maint-0.2.4'
2013-08-22 20:47:23 -04:00
Nick Mathewson
43f187ec2e
Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
2013-08-22 20:47:10 -04:00