Nick Mathewson
3ed7505dc5
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/relay.c
2010-11-30 19:23:40 -05:00
Nick Mathewson
ad87d6172b
fix changes file for 2210
2010-11-30 19:19:36 -05:00
Nick Mathewson
8fa4450fde
Do not invoke tls_renegotiated_cb for non-bufferevent connections too early.
...
This is not the most beautiful fix for this problem, but it is the simplest.
Bugfix for 2205. Thanks to Sebastian and Mashael for finding the
bug, and boboper/cypherpunks for figuring out why it was happening
and how to fix it, and for writing a few fixes.
2010-11-30 17:55:27 -05:00
Roger Dingledine
9f51e26715
fix memory leak introduced in 26e89742
...
found via valgrind
2010-11-30 16:52:19 -05:00
Nick Mathewson
25b0fd8868
Revise comment on 2210 a little; clean up n_streams/num_streams confusion
...
Also add a changes file
2010-11-29 16:07:27 -05:00
Nick Mathewson
89e97bdf94
Add wrappers function for libc random()
...
On windows, it's called something different.
2010-11-29 16:00:47 -05:00
Nick Mathewson
0eafe23ff3
Fix whitespace in patch for 2210 and backport to 0.2.2
2010-11-29 16:00:43 -05:00
Mashael AlSabah
12fa6e23cb
Improve fairness when activating streams in circuit_resume_edge_reading_helper
...
The reason the "streams problem" occurs is due to the complicated
interaction between Tor's congestion control and libevent. At some point
during the experiment, the circuit window is exhausted, which blocks all
edge streams. When a circuit level sendme is received at Exit, it
resumes edge reading by looping over linked list of edge streams, and
calling connection_start_reading() to inform libevent to resume reading.
When the streams are activated again, Tor gets the chance to service the
first three streams activated before the circuit window is exhausted
again, which causes all streams to be blocked again. As an experiment,
we reversed the order in which the streams are activated, and indeed the
first three streams, rather than the last three, got service, while the
others starved.
Our solution is to change the order in which streams are activated. We
choose a random edge connection from the linked list, and then we
activate streams starting from that chosen stream. When we reach the end
of the list, then we continue from the head of the list until our chosen
stream (treating the linked list as a circular linked list). It would
probably be better to actually remember which streams have received
service recently, but this way is simple and effective.
2010-11-29 15:34:21 -05:00
Nick Mathewson
19019f26b0
Merge remote branch 'origin/maint-0.2.2'
2010-11-29 15:30:17 -05:00
Nick Mathewson
a5174b092e
Merge branch 'exitstats' into maint-0.2.2
2010-11-29 15:28:22 -05:00
Nick Mathewson
a8a8e08220
comment karsten's bug2196 patch a little
2010-11-29 15:27:54 -05:00
Nick Mathewson
ae6b31aba9
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-11-24 17:06:26 -05:00
Nick Mathewson
251b40f720
Merge remote branch 'rransom/fix2195-fix' into maint-0.2.2
2010-11-24 17:02:22 -05:00
Robert Ransom
de75afc556
Avoid dereferencing NULL if a bridge fails to build an ei descriptor.
...
Reported by an anonymous commenter on Trac.
2010-11-24 13:18:11 -08:00
Karsten Loesing
4fed43ab2e
Report only the top 10 ports in exit-port stats.
2010-11-24 08:45:05 +01:00
Roger Dingledine
e57cb6b976
pick a more accurate release date
2010-11-22 22:44:20 -05:00
Roger Dingledine
713db8dbfa
bump to 0.2.2.19-alpha
2010-11-21 18:00:12 -05:00
Roger Dingledine
f54e75a2c6
prepare for our emergency openssl fix release
2010-11-21 16:59:42 -05:00
Roger Dingledine
d77bc69b0c
found this whitespace fix in a sandbox
2010-11-21 15:57:22 -05:00
Nick Mathewson
cbd3745924
Merge remote branch 'origin/maint-0.2.2'
2010-11-21 14:34:22 -05:00
Nick Mathewson
2bd64f9e8f
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2010-11-21 14:33:11 -05:00
Nick Mathewson
a9d2148f53
Merge branch 'fix2204' into maint-0.2.1
2010-11-21 14:28:38 -05:00
Nick Mathewson
92a99736fd
Do not set the hostname TLS extension server-side; only client-side
...
This may fix bug 2204, and resolve the incompatibility with openssl
0.9.8p/1.0.0b.
2010-11-20 22:21:50 -05:00
Nick Mathewson
9cbe64db45
Add missing cast when formatting uintptr_t
...
Found by Christian Kujau
2010-11-20 05:18:34 -05:00
Nick Mathewson
e361de80bb
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/router.c
2010-11-19 16:58:22 -05:00
Nick Mathewson
21be4b5b4c
Merge commit 'c643e0527c186b8ef2d259b2ef11a10c1d4ee3e5'
...
Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-11-19 16:55:07 -05:00
Nick Mathewson
a33b338c5b
Fix a unit test broken by fix for 2195
2010-11-19 16:50:14 -05:00
Nick Mathewson
54551f3148
Merge branch 'fix2183', remote branch 'rransom/fix2195-v2' into maint-0.2.2
2010-11-19 16:48:13 -05:00
Robert Ransom
b3470ce957
Add changes file for bug2195.
2010-11-19 13:46:09 -08:00
Robert Ransom
69472ca421
Fix logic error in router_dump_router_to_string.
...
Spotted by Nick Mathewson.
2010-11-19 13:23:45 -08:00
Nick Mathewson
e88486bc9d
Add comments to some of the bug2183 fix code
2010-11-19 16:13:11 -05:00
Nick Mathewson
c77a32932d
Fix wide lines in SIGNAL patch
2010-11-19 15:54:53 -05:00
Nick Mathewson
576b399b19
Add a changes file for SIGNAL events
2010-11-19 15:54:02 -05:00
Nick Mathewson
8f74e6ce26
Add some caveats to the signal event
2010-11-19 15:52:10 -05:00
John Brooks
7441999738
Add a SIGNAL event for control connections
...
Implements ticket #1955
2010-11-19 15:49:54 -05:00
Robert Ransom
780b8f4287
Generate a router descriptor even if generating an extra-info descriptor fails.
...
Fixes bug #2195 .
2010-11-17 08:33:48 -08:00
Robert Ransom
213bcb3c40
Do not emit an extra-info-digest descriptor line if the digest is zero.
2010-11-17 08:32:17 -08:00
Karsten Loesing
0f1afaf595
Tweak the bugfix for 2183 a bit more.
2010-11-17 10:43:14 +01:00
Roger Dingledine
c643e0527c
new development version
2010-11-16 14:45:40 -05:00
Roger Dingledine
910de7dfac
final touchups
2010-11-16 01:12:32 -05:00
Roger Dingledine
4f66bf4fe7
Merge branch 'maint-0.2.2'
...
Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-11-16 00:21:41 -05:00
Roger Dingledine
e1e7988537
bump to 0.2.2.18-alpha
2010-11-16 00:20:49 -05:00
Roger Dingledine
6b82a6e88d
Merge branch 'maint-0.2.2'
2010-11-16 00:16:25 -05:00
Roger Dingledine
a08a7e0fc6
warn more about AllowSingleHopExits
2010-11-16 00:13:25 -05:00
Roger Dingledine
e0b922b7e6
merge in more changelog entries
2010-11-15 23:54:20 -05:00
Roger Dingledine
a641646a98
Merge commit 'nickm/1776_redux_v1' into maint-0.2.2
2010-11-15 23:29:09 -05:00
Nick Mathewson
45b500d5a6
Clean up my 1776 fix a bit
...
Sebastian notes (and I think correctly) that one of our ||s should
have been an &&, which simplifies a boolean expression to decide
whether to replace bridges. I'm also refactoring out the negation at
the start of the expression, to make it more readable.
2010-11-15 19:43:53 -05:00
Nick Mathewson
550be1df69
Merge remote branch 'origin/maint-0.2.2'
2010-11-15 15:41:37 -05:00
Nick Mathewson
cbad9f4520
Move controller event for socks warning into log_unsafe_socks_warning
2010-11-15 15:41:21 -05:00
Nick Mathewson
9399b885cd
Merge remote branch 'origin/maint-0.2.2'
...
Conflicts:
src/or/buffers.c
2010-11-15 15:37:23 -05:00
