Nick Mathewson
05f672c8c2
Fix compilation of 3335 and 3825 fixes
...
In master, they ran into problems with the edge_conn/entry_conn split.
2011-10-03 15:13:38 -04:00
Nick Mathewson
4aa4bce474
Merge remote-tracking branch 'rransom-tor/bug3335-v2'
...
Conflicts:
src/or/connection_edge.c
src/or/rendclient.c
2011-10-03 15:06:07 -04:00
Nick Mathewson
a7f93b509c
Add changes file for bug 4094
2011-10-03 12:58:07 -04:00
Fabian Keil
13f0d22df0
Rephrase the log messages emitted if the TestSocks check is positive
...
Previously Tor would always claim to have been given a hostname
by the client, while actually only verifying that the client
is using SOCKS4A or SOCKS5 with hostnames. Both protocol versions
allow IP addresses, too, in which case the log messages were wrong.
Fixes #4094 .
2011-10-03 12:56:46 -04:00
Robert Ransom
c5226bfe1c
Remove an HS's last_hid_serv_requests entries when a conn. attempt ends
2011-10-02 16:19:36 -07:00
Robert Ransom
bcfc383dc9
Record the HS's address in last_hid_serv_request keys
2011-10-02 16:19:35 -07:00
Robert Ransom
e07307214e
Fix comment typo
2011-10-02 16:19:23 -07:00
Robert Ransom
fbea8c8ef1
Detect and remove unreachable intro points
2011-10-02 12:49:35 -07:00
Robert Ransom
34a6b8b7e5
Clear the timed_out flag when an HS connection attempt ends
2011-10-02 12:49:35 -07:00
Robert Ransom
eaed37d14c
Record intro point timeouts in rend_intro_point_t
2011-10-02 12:49:34 -07:00
Robert Ransom
6803c1c371
Refetch an HS's desc if we don't have a usable one
...
Previously, we wouldn't refetch an HS's descriptor unless we didn't
have one at all. That was equivalent to refetching iff we didn't have
a usable one, but the next commit will make us keep some non-usable HS
descriptors around in our cache.
Code bugfix on the release that introduced the v2 HS directory system,
because rend_client_refetch_v2_renddesc's documentation comment should
have described what it actually did, not what its behaviour happened
to be equivalent to; no behaviour change in this commit.
2011-10-02 12:42:19 -07:00
Sebastian Hahn
103c861dfe
Looks like Windows version 6.2 will be Windows 8
...
Thanks to funkstar for the report
2011-10-01 14:50:44 +02:00
Roger Dingledine
1fac96f4c6
bump to 0.2.3.5-alpha
2011-09-28 18:25:16 -04:00
Roger Dingledine
cff4e6765b
give 0.2.3.5-alpha a blurb
2011-09-28 18:25:09 -04:00
Roger Dingledine
0e4f5e7cb1
fix default for TokenBucketRefillInterval in man page
2011-09-28 18:23:17 -04:00
Roger Dingledine
25f786f7ec
fold in recent changes entries
2011-09-28 15:41:29 -04:00
Roger Dingledine
f6db0f128c
refill our token buckets 10 times/sec, not 100
...
refilling often is good, but refilling often has unclear side effects
on a) cpu load, and b) making sure every cell, ever, is sent out one at
a time
2011-09-28 15:38:36 -04:00
Roger Dingledine
36829539d6
Merge branch 'maint-0.2.2'
2011-09-28 15:38:02 -04:00
Roger Dingledine
ff8aba7053
bridges should use create_fast cells for their own circuits
...
fixes bug 4124, as noticed in bug 4115
2011-09-28 15:35:27 -04:00
Roger Dingledine
4e88a3bc3e
Merge branch 'maint-0.2.2'
2011-09-28 15:13:05 -04:00
Roger Dingledine
458cc9d351
start preparing the 0.2.3.5-alpha changelog
2011-09-28 15:12:16 -04:00
Roger Dingledine
0b5d2646d5
bug 4115: make bridges use begindir for their dir fetches
...
removes another avenue for enumerating bridges.
2011-09-28 14:50:43 -04:00
Nick Mathewson
6201b8b361
Make sure the microdesc cache is loaded before setting a v3 md consensus
...
Otherwise, we can wind up munging our reference counts if we set it in
the middle of loading the nodes. This happens because
nodelist_set_consensus() and microdesc_reload_cache() are both in the
business of adjusting microdescriptors' references.
2011-09-28 14:19:39 -04:00
Nick Mathewson
4a10845075
Add some debugging code to microdesc.[ch]
2011-09-28 14:13:49 -04:00
Nick Mathewson
a4b7525c3c
Fix a crash bug in tor_assert(md->held_by_node)
...
The fix is to turn held_by_node into a reference count.
Fixes bug 4118; bugfix on 0.2.3.1-alpha.
2011-09-28 13:40:21 -04:00
Roger Dingledine
e98c9a1bf6
if we have enough usable guards, just pick one
...
we don't need to check whether we don't have enough guards right after
concluding that we do have enough.
slight efficiency fix suggested by an anonymous fellow on irc.
2011-09-27 17:35:31 -04:00
Roger Dingledine
88516f65c9
Merge branch 'maint-0.2.2'
2011-09-24 22:47:53 -04:00
Roger Dingledine
1c2e4d1336
trivial whitespace changes, take two
2011-09-24 22:46:21 -04:00
Nick Mathewson
c42a1886cc
Trivial whitespace fixes
2011-09-24 22:15:59 -04:00
Nick Mathewson
ccceefe136
Add a changes file for Tom Lowenthal's patch for #4063
2011-09-24 22:15:13 -04:00
Tom Lowenthal
5835acc6f9
Ticket #4063 - change circuit build timeout log entries from NOTICE to INFO
2011-09-24 22:12:40 -04:00
George Kadianakis
e2703e3654
Improve wording in some comments and log messages.
2011-09-23 17:50:56 +02:00
Nick Mathewson
5a8dcca8f7
Merge branch 'feature3630-rebased'
2011-09-22 15:54:40 -04:00
Nick Mathewson
fee094afcd
Fix issues in 3630 patch noted by Karsten
2011-09-22 15:07:35 -04:00
Nick Mathewson
a8297a301e
Changes file for feature3630
2011-09-22 15:07:35 -04:00
Nick Mathewson
41dfc4c19c
Make bufferevents work with TokenBucketRefillInterval
2011-09-22 15:07:34 -04:00
Nick Mathewson
052b95e2f1
Refactor connection_bucket_refill(_helper) to avoid roundoff
...
We were doing "divide bandwidth by 1000, then multiply by msec", but
that would lose accuracy: instead of getting your full bandwidth,
you'd lose up to 999 bytes per sec. (Not a big deal, but every byte
helps.)
Instead, do the multiply first, then the division. This can easily
overflow a 32-bit value, so make sure to do it as a 64-bit operation.
2011-09-22 15:07:34 -04:00
Nick Mathewson
1e61184628
Make documentation for TokenBucketRefillInterval match its behavior
2011-09-22 15:07:34 -04:00
Nick Mathewson
0721abbf1b
Move around check for TokenBucketRefillInterval; disallow changes to it
2011-09-22 15:07:34 -04:00
Florian Tschorsch
6b1d8321ae
New torrc option to allow bucket refill intervals of less than 1 sec
...
Implements bug3630.
2011-09-22 15:07:23 -04:00
Nick Mathewson
40288e1e66
Merge remote-tracking branch 'origin/maint-0.2.2'
2011-09-20 10:25:56 -04:00
Nick Mathewson
bfa75f70bb
changes file for bug 4059
2011-09-20 09:56:26 -04:00
Mansour Moufid
1ba90ab655
Fix a potentially useless integer overflow check.
...
GCC 4.2 and maybe other compilers optimize away unsigned integer
overflow checks of the form (foo + bar < foo), for all bar.
Fix one such check in `src/common/OpenBSD_malloc_Linux.c'.
2011-09-20 09:52:44 -04:00
Roger Dingledine
0c0345a3d0
Merge branch 'maint-0.2.2'
2011-09-15 16:35:26 -04:00
Roger Dingledine
ac7b6c508d
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-09-15 16:34:47 -04:00
Karsten Loesing
679f617345
Update to the September 2011 GeoIP database.
2011-09-15 16:33:36 -04:00
Nick Mathewson
2394c74017
Log errno on listener socket creation failure.
...
This may help diagnose bug 4027.
2011-09-15 09:51:48 -04:00
Robert Ransom
c1ac0695d5
Fix a bogus warning
2011-09-14 00:05:03 -07:00
Roger Dingledine
6a799c10ee
bump to 0.2.3.4-alpha-dev
2011-09-13 22:04:47 -04:00
Roger Dingledine
5f4f727d58
slight tweak to unify things
2011-09-13 20:26:32 -04:00
