7cee98f5fd
Merge branch 'maint-0.2.2' into release-0.2.2
2011-04-04 03:55:06 -04:00
9d2b3849b2
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-04-04 03:53:38 -04:00
0cdd262941
switch to the apr 2011 geoip db
2011-04-04 03:52:58 -04:00
101503b6fa
bump to 0.2.2.24-alpha
2011-04-04 03:43:02 -04:00
c7473adec0
Merge branch 'maint-0.2.2' into release-0.2.2
2011-04-01 10:16:57 -04:00
65eb0e41ac
Use cbt to tell when to launch parallel intro circuit
...
Implement feature from trac #2799
2011-03-30 14:41:53 -04:00
aa950e6c48
Use timevals, not time_t, when expiring circuits.
...
We've got millisecond timers now, we might as well use them.
This change won't actually make circuits get expiered with microsecond
precision, since we only call the expiry functions once per second.
Still, it should avoid the situation where we have a circuit get
expired too early because of rounding.
A couple of the expiry functions now call tor_gettimeofday: this
should be cheap since we're only doing it once per second. If it gets
to be called more often, though, we should onsider having the current
time be an argument again.
2011-03-30 14:41:41 -04:00
5eaba5ac21
Implement replacements for timer(add,cmp,sub) on platforms lacking them.
2011-03-30 14:41:41 -04:00
fe86be61b6
Fix signed/unsigned compare warning
2011-03-18 12:42:00 -04:00
f3d6663665
Merge remote branch 'sebastian/bug2696' into maint-0.2.2
2011-03-18 12:39:40 -04:00
547635c004
Futz with the clang patch a bit and tidy some geoip.c stuff
2011-03-17 14:06:04 -04:00
9dfa244484
Document a few more members.
2011-03-16 18:10:15 -04:00
721954b3a2
Resolve the one DOCDOC in the 0.2.2 code atm
2011-03-16 18:07:55 -04:00
8f9cfa0abe
Remove a useless doxygen comment
2011-03-16 18:07:42 -04:00
27d1675d93
Move the decl for tor_gettimofday_cache_clear to the right header
2011-03-16 17:54:48 -04:00
3310dd2358
Clean up whitespace
2011-03-16 17:11:30 -04:00
6617822b84
Doxygen documentation for about 100 things that didn't have any
...
About 860 doxygen-less things remain in 0.2.2
2011-03-16 17:05:37 -04:00
7f6af7a602
Fix up all doxygen warnings other than "foo is not documented"
2011-03-16 14:47:27 -04:00
c5ffd44ccd
Merge branch 'bug2756_relay' into maint-0.2.2
2011-03-15 17:13:07 -04:00
a86e27cf00
Fix comment for connection_edge_consider_sending_sendme
2011-03-15 15:35:11 -04:00
ab418447eb
Merge branch 'bug2757' into maint-0.2.2
2011-03-15 15:18:15 -04:00
5938804d17
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-15 15:14:12 -04:00
30b3f0cdb1
Fix a compile warning when using clang
...
Issue noticed by Steven Murdoch; fixes bug 2689. The cast didn't do
anything, and we don't need to look at the return value of the function
here.
2011-03-15 15:13:35 -04:00
98abe1420d
Fix a log message typo
2011-03-15 09:48:26 -07:00
3af59dcaee
Log the source of a rejected POSTed v3 vote
...
Related to ticket 2683.
2011-03-15 09:16:58 -07:00
06f026de66
Check newconn, not conn, before marking newconn for close
...
This fixes bug 2757. It's a bugfix on 85da676108
2011-03-14 18:52:15 -04:00
1d36a8e9ae
Consider sending stream-level SENDME cells on partial flushes.
...
Right now, we only consider sending stream-level SENDME cells when we
have completely flushed a connection_edge's outbuf, or when it sends
us a DATA cell. Neither of these is ideal for throughput.
This patch changes the behavior so we now call
connection_edge_consider_sending_sendme when we flush _some_ data from
an edge outbuf.
Fix for bug 2756; bugfix on svn r152.
2011-03-14 17:48:45 -04:00
626912a81a
Merge branch 'maint-0.2.2' into release-0.2.2
2011-03-14 17:21:36 -04:00
b97d9abd09
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-14 17:04:53 -04:00
0588330c1d
Merge remote branch 'arma/bug2510' into maint-0.2.2
2011-03-14 16:14:54 -04:00
cb101c4815
Merge branch 'bug2511' into bug2510
2011-03-14 15:52:53 -04:00
b639add1a0
Merge remote branch 'arma/bug2716' into maint-0.2.2
2011-03-14 15:29:02 -04:00
72b89c96bf
fix two issues pointed out by nickm
2011-03-13 16:56:41 -04:00
1a9d19e972
we're not reachable if we don't have a routerinfo yet
2011-03-13 15:47:59 -04:00
61f648ae37
fix one more typo
2011-03-13 15:22:45 -04:00
176fde505f
Tweak bug2716 patch a little
...
Name the magic value "10" rather than re-deriving it.
Comment more.
Use the pattern that works for periodic timers, not the pattern that
doesn't work. ;)
2011-03-12 00:19:52 -05:00
d34a5cdc59
Merge branch 'hsdir_assignment' into maint-0.2.2
2011-03-11 23:30:25 -05:00
3a0c602155
Clarify threat description and avoid negative uptimes.
2011-03-11 23:27:53 -05:00
977e396e86
improve accuracy for when a relay went unreachable
2011-03-11 22:12:15 -05:00
600ad7bf8d
Merge commit 'sebastian/bug2663' into maint-0.2.2
2011-03-11 20:37:21 -05:00
f7a3cdc8f2
Use observed instead of declared uptime for HSDir
...
It is important to verify the uptime claim of a relay instead of just
trusting it, otherwise it becomes too easy to blackhole a specific
hidden service. rephist already has data available that we can use here.
Bugfix on 0.2.0.10-alpha.
2011-03-11 18:44:35 +01:00
473ff26563
Fix two compile warnings when using clang
...
Issue found by Steven Murdoch
2011-03-10 01:48:19 +01:00
b85eb949b5
bump to 0.2.2.23-alpha
2011-03-08 18:37:38 -05:00
2a8e9aa8e3
Merge branch 'maint-0.2.2' into release-0.2.2
2011-03-08 18:16:46 -05:00
6426cd14f3
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-03-08 18:16:06 -05:00
d080fe8db1
move to march 2011 geoip file
2011-03-08 18:15:17 -05:00
00446973f2
Merge remote branch 'sebastian/bug2250' into maint-0.2.2
2011-03-08 16:13:28 -05:00
451a2fac0c
Merge branch 'maint-0.2.2' into release-0.2.2
2011-03-08 16:12:45 -05:00
0d78a16c36
Merge remote branch 'sebastian/bug1035' into maint-0.2.2
2011-03-08 15:52:43 -05:00
9ad083d573
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-08 15:20:48 -05:00
Roger Dingledine
Nick Mathewson
Sebastian Hahn
Robert Ransom