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
c8136bc9b6
fold in more changes files
2011-04-04 03:38:42 -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
22f7042b91
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-28 17:49:34 -04:00
3a7cee9d29
Fix configure.in zlib package names.
2011-03-28 17:48:22 -04:00
4762118832
Small tweaks for bug2698 bugfix
2011-03-27 05:38:53 +02:00
b62abf9f21
Fix libevent autoconf bug #2698
2011-03-27 05:38:51 +02:00
f3d6663665
Merge remote branch 'sebastian/bug2696' into maint-0.2.2
2011-03-18 12:39:40 -04:00
4aac35cafa
Add 2696 changes file
2011-03-18 17:13:43 +01:00
cf399f1034
add changes file for the doxygen issues
2011-03-16 17:13:27 -04:00
c5ffd44ccd
Merge branch 'bug2756_relay' into maint-0.2.2
2011-03-15 17:13:07 -04:00
ab418447eb
Merge branch 'bug2757' into maint-0.2.2
2011-03-15 15:18:15 -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
704a27b029
fold in changes files so far
2011-03-14 17:28:38 -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
b639add1a0
Merge remote branch 'arma/bug2716' into maint-0.2.2
2011-03-14 15:29:02 -04:00
1a9d19e972
we're not reachable if we don't have a routerinfo yet
2011-03-13 15:47:59 -04: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
af04bd489b
Merge branch 'maint-0.2.2' into release-0.2.2
2011-03-11 17:42:00 -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
78d5955e5b
oops. I got the bug number wrong.
2011-03-09 16:22:18 -05:00
f31ba6a356
openSUSE initscript create /var/run/tor fixes Ticket #2573
...
(changes file added by nickm)
2011-03-09 16:18:44 -05:00
516426cfd2
fold in further changes files
2011-03-08 18:19:20 -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
fac45b4287
fold in the latest changes files
2011-03-08 17:05:10 -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
9a6df21539
Avoid crash in any_pending_bridge_descriptor_fetches
...
This is based on shitlei's fix for bug2629, with extra parens removed.
Fixes bug 2629, bugfix on 0.2.1.2-alpha.
2011-03-08 15:17:41 -05:00
3bd83b8fb6
Merge remote branch 'sebastian/bug2660' into maint-0.2.2
2011-03-07 17:09:23 -05:00
20569f9297
Merge branch 'maint-0.2.2' into release-0.2.2
2011-03-06 20:21:46 -05:00
35fcec3880
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-06 13:42:28 -05:00
4fa70e11ed
Merge branch 'real_ipv6_fix' into maint-0.2.1
2011-03-06 13:42:05 -05:00
2ce132e335
Oops, here's the *REAL* fix for the ipv6 issue
...
We need to _REJECT_ descriptors with accept6/reject6 lines. If we
let them onto the network , other un-upgraded tors will crash.
2011-03-06 13:41:55 -05:00
0f637492e3
Merge branch 'careful_with_all_descs' into maint-0.2.1
2011-03-06 13:35:42 -05:00
b231026c42
changes file for careful_with_all_descs
2011-03-06 13:35:24 -05:00
ed14888e7e
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
...
Conflicts:
src/or/policies.c
2011-03-06 13:20:21 -05:00
Roger Dingledine
Nick Mathewson
Erinn Clark
Sebastian Hahn
Jacob Appelbaum
Robert Ransom
Andreas Stieger