]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
14 years agoRevise the manpage to contain the actual intended *Nodes behavior
Nick Mathewson [Thu, 10 Mar 2011 23:25:51 +0000 (18:25 -0500)] 
Revise the manpage to contain the actual intended *Nodes behavior

This is a squashed version of my former desired_nodes_behavior branch
that we used to specify the intended results wrt bug 1090.

14 years agoExpose a new process_signal(uintptr_t), not signal_callback()
Nick Mathewson [Tue, 26 Apr 2011 19:20:08 +0000 (15:20 -0400)] 
Expose a new process_signal(uintptr_t), not signal_callback()

This is a tweak to the bug2917 fix.  Basically, if we want to simulate
a signal arriving in the controller, we shouldn't have to pretend that
we're Libevent, or depend on how Tor sets up its Libevent callbacks.

14 years agoMerge remote-tracking branch 'sebastian/bug2917' into maint-0.2.2
Nick Mathewson [Tue, 26 Apr 2011 19:17:03 +0000 (15:17 -0400)] 
Merge remote-tracking branch 'sebastian/bug2917' into maint-0.2.2

14 years agoMerge remote-tracking branch 'public/bug2332' into maint-0.2.2
Nick Mathewson [Tue, 26 Apr 2011 17:10:54 +0000 (13:10 -0400)] 
Merge remote-tracking branch 'public/bug2332' into maint-0.2.2

14 years agoDowngrade notice to info when downloading a cert.
Nick Mathewson [Tue, 26 Apr 2011 16:46:07 +0000 (12:46 -0400)] 
Downgrade notice to info when downloading a cert.

14 years agofix some comments before they create conflicts
Roger Dingledine [Tue, 26 Apr 2011 15:28:49 +0000 (11:28 -0400)] 
fix some comments before they create conflicts

14 years agoFix compilation in last patch
Nick Mathewson [Tue, 26 Apr 2011 15:14:46 +0000 (11:14 -0400)] 
Fix compilation in last patch

14 years agoMerge remote-tracking branch 'sebastian/bug2704' into maint-0.2.2
Nick Mathewson [Tue, 26 Apr 2011 15:07:48 +0000 (11:07 -0400)] 
Merge remote-tracking branch 'sebastian/bug2704' into maint-0.2.2

14 years agoFix more of bug 2704
Sebastian Hahn [Tue, 26 Apr 2011 13:33:08 +0000 (15:33 +0200)] 
Fix more of bug 2704

The last entry of the *Maxima values in the state file was inflated by a
factor of NUM_SECS_ROLLING_MEASURE (currently 10). This could lead to
a wrong maximum value propagating through the state file history.

14 years agoDon't leak the local hostname in relay nicknames
Sebastian Hahn [Tue, 26 Apr 2011 03:07:37 +0000 (05:07 +0200)] 
Don't leak the local hostname in relay nicknames

Fixes bug 2979, reported by tagnaq.

14 years agoMerge commit '91aa6f08bcf0acbdfa038aaffe73e327ddd87c67' into maint-0.2.2
Nick Mathewson [Mon, 25 Apr 2011 23:03:15 +0000 (19:03 -0400)] 
Merge commit '91aa6f08bcf0acbdfa038aaffe73e327ddd87c67' into maint-0.2.2

14 years agoMake the Log configuration option expand ~
Sebastian Hahn [Fri, 22 Apr 2011 14:06:52 +0000 (16:06 +0200)] 
Make the Log configuration option expand ~

14 years agoMerge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Nick Mathewson [Thu, 21 Apr 2011 17:40:00 +0000 (13:40 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

14 years agoFix a bug in removing DNSPort requests from their circular list
Nick Mathewson [Thu, 21 Apr 2011 17:39:00 +0000 (13:39 -0400)] 
Fix a bug in removing DNSPort requests from their circular list

Under heavy load, this could result in an assertion failure.  Fix for
bug 2933; bugfix on 0.2.0.10-alpha.

14 years agoPrevent hugely inflated observed bandwidth values
Sebastian Hahn [Tue, 19 Apr 2011 14:00:41 +0000 (16:00 +0200)] 
Prevent hugely inflated observed bandwidth values

When reading the bw history from the state file, we'd add the 900-second
value as traffic that occured during one second. Fix that by adding the
average value to each second.

This bug was present since 0.2.0.5-alpha, but was hidden until
0.2.23-alpha when we started using the saved values.

14 years agoDon't sometimes undercount bw average
Sebastian Hahn [Tue, 19 Apr 2011 15:12:27 +0000 (17:12 +0200)] 
Don't sometimes undercount bw average

This fixes the first part of bug 2704. It should occur only rarely when
no bw maxima are known. Bugfix on 0.2.2.23-alpha. Fixes bug 2704.

14 years agoStandardize our printf code on %d, not %i.
Nick Mathewson [Tue, 19 Apr 2011 16:40:26 +0000 (12:40 -0400)] 
Standardize our printf code on %d, not %i.

14 years agoMerge remote-tracking branch 'rransom/bug2948' into maint-0.2.2
Nick Mathewson [Tue, 19 Apr 2011 16:36:49 +0000 (12:36 -0400)] 
Merge remote-tracking branch 'rransom/bug2948' into maint-0.2.2

14 years agoMerge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Nick Mathewson [Tue, 19 Apr 2011 16:31:42 +0000 (12:31 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

14 years agoMerge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1
Nick Mathewson [Tue, 19 Apr 2011 16:30:50 +0000 (12:30 -0400)] 
Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1

14 years agoMerge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Nick Mathewson [Tue, 19 Apr 2011 16:30:11 +0000 (12:30 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

14 years agoOuch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only)
Nick Mathewson [Tue, 19 Apr 2011 16:29:20 +0000 (12:29 -0400)] 
Ouch: correctly tabify the micro-revision.i target in Makefile.am (0.2.1 only)

14 years agoCorrect HS descriptor length check
Nick Mathewson [Mon, 18 Apr 2011 20:53:13 +0000 (13:53 -0700)] 
Correct HS descriptor length check

Fixes bug 2948.

14 years agoMerge branch 'bug2750-v3' into bug2948
Robert Ransom [Mon, 18 Apr 2011 20:36:19 +0000 (13:36 -0700)] 
Merge branch 'bug2750-v3' into bug2948

14 years agoAdd an XXX
Robert Ransom [Mon, 18 Apr 2011 20:25:48 +0000 (13:25 -0700)] 
Add an XXX

14 years agoCorrect the warning emitted when rejecting an oversized HS desc
Robert Ransom [Mon, 11 Apr 2011 09:26:07 +0000 (02:26 -0700)] 
Correct the warning emitted when rejecting an oversized HS desc

14 years agoMake SIGNAL DUMP work on FreeBSD
Sebastian Hahn [Fri, 15 Apr 2011 03:04:39 +0000 (20:04 -0700)] 
Make SIGNAL DUMP work on FreeBSD

While doing so, get rid of the now unnecessary function
control_signal_act().

Fixes bug 2917, reported by Robert Ransom. Bugfix on commit
9b4aa8d2abbce71398e58188209a1b1d04885b96. This patch is loosely based on
a patch by Robert (Changelog entry).

14 years agoAdd a changes file for the osx 10.6 compile fix
Sebastian Hahn [Fri, 8 Apr 2011 20:56:28 +0000 (22:56 +0200)] 
Add a changes file for the osx 10.6 compile fix

We forgot to put it into 0.2.2.24-alpha.

14 years agoMerge branch 'bug2373' into maint-0.2.2
Nick Mathewson [Fri, 8 Apr 2011 17:35:26 +0000 (13:35 -0400)] 
Merge branch 'bug2373' into maint-0.2.2

14 years agoUse GetTempDir instead of hardcoded path to c:\windows\tmp for unittests
Gisle Vanem [Thu, 7 Apr 2011 22:34:11 +0000 (18:34 -0400)] 
Use GetTempDir instead of hardcoded path to c:\windows\tmp for unittests

14 years agoFree pending_cb_messages on exit
Nick Mathewson [Thu, 7 Apr 2011 19:25:33 +0000 (15:25 -0400)] 
Free pending_cb_messages on exit

14 years agoFree circuits_for_buffer_stats on shutdown
Nick Mathewson [Thu, 7 Apr 2011 18:59:28 +0000 (14:59 -0400)] 
Free circuits_for_buffer_stats on shutdown

14 years agoFix up some cell-queue stats issues in rephist.c
Nick Mathewson [Thu, 7 Apr 2011 18:56:50 +0000 (14:56 -0400)] 
Fix up some cell-queue stats issues in rephist.c

- Document the structure and variables.
- Make circuits_for_buffer_stats into a static variable.
- Don't die horribly if interval_length is 0.
- Remove the unused local_circ_id field.
- Reorder the fields of circ_buffer_stats_t for cleaner alignment layout.

14 years agoMerge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2
Nick Mathewson [Thu, 7 Apr 2011 16:03:04 +0000 (12:03 -0400)] 
Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2

Conflicts:
src/or/or.h

14 years agoAllow controllers a more up-to-date view of bridge usage.
Nick Mathewson [Wed, 16 Mar 2011 02:39:22 +0000 (22:39 -0400)] 
Allow controllers a more up-to-date view of bridge usage.

Instead of answering GETINFO requests about our geoip usage only after
running for 24 hours, this patch makes us answer GETINFO requests
immediately.  We still round and quantize as before.

Implements bug2711.

Also, refactor the heck out of the bridge usage formatting code.  No
longer should we need to do a generate-parse-and-regenerate cycle to
get the controller string, and that lets us simplify the code a lot.

14 years agoFix a compile warning on OS X 10.6
Sebastian Hahn [Thu, 7 Apr 2011 03:30:49 +0000 (05:30 +0200)] 
Fix a compile warning on OS X 10.6

14 years agoMerge maint-0.2.1 for bug2402_again fixes . Use "-s ours" so we don't actually take...
Nick Mathewson [Wed, 6 Apr 2011 20:15:48 +0000 (16:15 -0400)] 
Merge maint-0.2.1 for bug2402_again fixes .  Use "-s ours" so we don't actually take the patch.

14 years agoMerge remote-tracking branch 'public/bug2402_again' into maint-0.2.1
Nick Mathewson [Wed, 6 Apr 2011 20:13:22 +0000 (16:13 -0400)] 
Merge remote-tracking branch 'public/bug2402_again' into maint-0.2.1

14 years agoMerge branch 'maint-0.2.1' into maint-0.2.2
Roger Dingledine [Mon, 4 Apr 2011 07:53:38 +0000 (03:53 -0400)] 
Merge branch 'maint-0.2.1' into maint-0.2.2

14 years agoswitch to the apr 2011 geoip db
Roger Dingledine [Mon, 4 Apr 2011 07:52:58 +0000 (03:52 -0400)] 
switch to the apr 2011 geoip db

14 years agoUse cbt to tell when to launch parallel intro circuit
Nick Mathewson [Sat, 26 Mar 2011 05:39:11 +0000 (01:39 -0400)] 
Use cbt to tell when to launch parallel intro circuit

Implement feature from trac #2799

14 years agoUse timevals, not time_t, when expiring circuits.
Nick Mathewson [Sat, 26 Mar 2011 05:34:42 +0000 (01:34 -0400)] 
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.

14 years agoImplement replacements for timer(add,cmp,sub) on platforms lacking them.
Nick Mathewson [Wed, 30 Mar 2011 18:29:57 +0000 (14:29 -0400)] 
Implement replacements for timer(add,cmp,sub) on platforms lacking them.

14 years agoMerge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
Nick Mathewson [Mon, 28 Mar 2011 21:49:34 +0000 (17:49 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

14 years agoFix configure.in zlib package names.
Erinn Clark [Tue, 15 Feb 2011 01:15:42 +0000 (02:15 +0100)] 
Fix configure.in zlib package names.

14 years agoSend END_STREAM_REASON_NOROUTE: clients that didn't grok it are now obsolete
Nick Mathewson [Mon, 28 Mar 2011 17:42:59 +0000 (13:42 -0400)] 
Send END_STREAM_REASON_NOROUTE: clients that didn't grok it are now obsolete

14 years agoImprove a few comments
Sebastian Hahn [Mon, 28 Mar 2011 17:28:04 +0000 (19:28 +0200)] 
Improve a few comments

14 years agoAdd a missing cast to silence the compiler
Sebastian Hahn [Mon, 28 Mar 2011 16:20:50 +0000 (18:20 +0200)] 
Add a missing cast to silence the compiler

14 years agoSmall tweaks for bug2698 bugfix
Sebastian Hahn [Sun, 27 Mar 2011 03:35:17 +0000 (05:35 +0200)] 
Small tweaks for bug2698 bugfix

14 years agoFix libevent autoconf bug #2698
Jacob Appelbaum [Thu, 17 Mar 2011 01:35:31 +0000 (18:35 -0700)] 
Fix libevent autoconf bug #2698

14 years agoFix handling of StreamID exhaustion.
Nick Mathewson [Fri, 25 Mar 2011 21:57:15 +0000 (17:57 -0400)] 
Fix handling of StreamID exhaustion.

Since svn r1475/git 5b6099e8 in tor-0.0.6, we have responded to an
exhaustion of all 65535 stream IDs on a circuit by marking that
circuit for close.  That's not the right response.  Instead, we
should mark the circuit as "too dirty for new circuits".

Of course in reality this isn't really right either.  If somebody
has managed to cram 65535 streams onto a circuit, the circuit is
probably not going to work well for any of those streams, so maybe
we should be limiting the number of streams on an origin circuit
concurrently.

Also, closing the stream in this case is probably the wrong thing to
do as well, but fixing that can also wait.

14 years agoAdd XXX023s for our timestamp_dirty abuse.
Nick Mathewson [Fri, 25 Mar 2011 21:49:44 +0000 (17:49 -0400)] 
Add XXX023s for our timestamp_dirty abuse.

14 years agoClarify some documentation and comments wrt resetting OR token buckets
Nick Mathewson [Fri, 25 Mar 2011 21:21:16 +0000 (17:21 -0400)] 
Clarify some documentation and comments wrt resetting OR token buckets

14 years agoRemove workaround code for bug539
Nick Mathewson [Fri, 25 Mar 2011 21:11:04 +0000 (17:11 -0400)] 
Remove workaround code for bug539

We fixed bug 539 (where directories would say "503" but send data
anyway) back in 0.2.0.16-alpha/0.1.2.19.  Because most directory
versions were affected, we added workaround to make sure that we
examined the contents of 503-replies to make sure there wasn't any
data for them to find.  But now that such routers are nonexistent,
we can remove this code.  (Even if somebody fired up an 0.1.2.19
directory cache today, it would still be fine to ignore data in its
erroneous 503 replies.)

14 years agoFix some 'impossible' overflow bugs in byte counting
Nick Mathewson [Fri, 25 Mar 2011 20:45:25 +0000 (16:45 -0400)] 
Fix some 'impossible' overflow bugs in byte counting

The first was genuinely impossible, I think: it could only happen
when the amount we read differed from the amount we wanted to read
by more than INT_MAX.

The second is just very unlikely: it would give incorrect results to
the controller if you somehow wrote or read more than 4GB on one
edge conn in one second.  That one is a bugfix on 0.1.2.8-beta.

14 years agoLook at the right errno when sending reason for connect() failure
Nick Mathewson [Fri, 25 Mar 2011 20:14:42 +0000 (16:14 -0400)] 
Look at the right errno when sending reason for connect() failure

In afe414 (tor-0.1.0.1-rc~173), when we moved to
connection_edge_end_errno(), we used it in handling errors from
connection_connect().  That's not so good, since by the time
connection_connect() returns, the socket is no longer set, and we're
supposed to be looking at the socket_errno return value from
connection_connect() instead.  So do what we should've done, and
look at the socket_errno value that we get from connection_connect().

14 years agoTriage the XXX022 and XXX021 comments remaining in the code
Nick Mathewson [Fri, 25 Mar 2011 20:01:16 +0000 (16:01 -0400)] 
Triage the XXX022 and XXX021 comments remaining in the code

Remove some, postpone others, leave some alone.  Now the only
remaining XXX022s are ones that seem important to fix or investigate.

14 years agoComment out ancient asserts for bug 930; resolve an xxx021
Nick Mathewson [Fri, 25 Mar 2011 19:44:02 +0000 (15:44 -0400)] 
Comment out ancient asserts for bug 930; resolve an xxx021

14 years agoFixup tor_addr_to_sockaddr return convention
Nick Mathewson [Fri, 25 Mar 2011 19:41:19 +0000 (15:41 -0400)] 
Fixup tor_addr_to_sockaddr return convention

14 years agoClean up a comment-conversation about bad libevent version/method combos
Nick Mathewson [Fri, 25 Mar 2011 19:32:45 +0000 (15:32 -0400)] 
Clean up a comment-conversation about bad libevent version/method combos

14 years agoRemove the "fuzzy time" code
Nick Mathewson [Fri, 25 Mar 2011 19:27:06 +0000 (15:27 -0400)] 
Remove the "fuzzy time" code

It was the start of a neat idea, but it only got used in 3 places,
none of which really needed it.

14 years agoFix signed/unsigned compare warning
Nick Mathewson [Fri, 18 Mar 2011 16:42:00 +0000 (12:42 -0400)] 
Fix signed/unsigned compare warning

14 years agoMerge remote branch 'sebastian/bug2696' into maint-0.2.2
Nick Mathewson [Fri, 18 Mar 2011 16:39:40 +0000 (12:39 -0400)] 
Merge remote branch 'sebastian/bug2696' into maint-0.2.2

14 years agoAdd 2696 changes file
Sebastian Hahn [Fri, 18 Mar 2011 16:13:43 +0000 (17:13 +0100)] 
Add 2696 changes file

14 years agoRemove superfluous -g -O2 compiler argument
Sebastian Hahn [Fri, 18 Mar 2011 16:04:01 +0000 (17:04 +0100)] 
Remove superfluous -g -O2 compiler argument

Autoconf adds -g -O2 by default, so adding it ourselves is not required.
It also caused a warning with clang for every source file, so remove it
here. Fixes last issue of ticket 2696.

14 years agoFutz with the clang patch a bit and tidy some geoip.c stuff
Nick Mathewson [Thu, 17 Mar 2011 18:06:04 +0000 (14:06 -0400)] 
Futz with the clang patch a bit and tidy some geoip.c stuff

14 years agoDocument a few more members.
Nick Mathewson [Wed, 16 Mar 2011 22:10:15 +0000 (18:10 -0400)] 
Document a few more members.

14 years agoResolve the one DOCDOC in the 0.2.2 code atm
Nick Mathewson [Wed, 16 Mar 2011 22:07:55 +0000 (18:07 -0400)] 
Resolve the one DOCDOC in the 0.2.2 code atm

14 years agoRemove a useless doxygen comment
Nick Mathewson [Wed, 16 Mar 2011 22:07:42 +0000 (18:07 -0400)] 
Remove a useless doxygen comment

14 years agoMove the decl for tor_gettimofday_cache_clear to the right header
Nick Mathewson [Wed, 16 Mar 2011 21:54:43 +0000 (17:54 -0400)] 
Move the decl for tor_gettimofday_cache_clear to the right header

14 years agoadd changes file for the doxygen issues
Nick Mathewson [Wed, 16 Mar 2011 21:13:27 +0000 (17:13 -0400)] 
add changes file for the doxygen issues

14 years agoClean up whitespace
Nick Mathewson [Wed, 16 Mar 2011 21:11:27 +0000 (17:11 -0400)] 
Clean up whitespace

14 years agoDoxygen documentation for about 100 things that didn't have any
Nick Mathewson [Wed, 16 Mar 2011 21:05:37 +0000 (17:05 -0400)] 
Doxygen documentation for about 100 things that didn't have any

About 860 doxygen-less things remain in 0.2.2

14 years agoFix up all doxygen warnings other than "foo is not documented"
Nick Mathewson [Wed, 16 Mar 2011 18:47:27 +0000 (14:47 -0400)] 
Fix up all doxygen warnings other than "foo is not documented"

14 years agoTurn on the "source browser" feature for our generated HTML.
Nick Mathewson [Wed, 16 Mar 2011 18:36:42 +0000 (14:36 -0400)] 
Turn on the "source browser" feature for our generated HTML.

14 years agoRun "doxygen -u" to update doxygen config file.
Nick Mathewson [Wed, 16 Mar 2011 18:34:59 +0000 (14:34 -0400)] 
Run "doxygen -u" to update doxygen config file.

14 years agoMerge branch 'bug2756_relay' into maint-0.2.2
Nick Mathewson [Tue, 15 Mar 2011 21:13:07 +0000 (17:13 -0400)] 
Merge branch 'bug2756_relay' into maint-0.2.2

14 years agoFix comment for connection_edge_consider_sending_sendme
Nick Mathewson [Tue, 15 Mar 2011 19:35:11 +0000 (15:35 -0400)] 
Fix comment for connection_edge_consider_sending_sendme

14 years agoMerge branch 'bug2757' into maint-0.2.2
Nick Mathewson [Tue, 15 Mar 2011 19:18:15 +0000 (15:18 -0400)] 
Merge branch 'bug2757' into maint-0.2.2

14 years agoMerge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Nick Mathewson [Tue, 15 Mar 2011 19:14:12 +0000 (15:14 -0400)] 
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

14 years agoFix a compile warning when using clang
Sebastian Hahn [Wed, 9 Mar 2011 15:39:04 +0000 (16:39 +0100)] 
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.

14 years agoFix a log message typo
Robert Ransom [Tue, 15 Mar 2011 16:48:26 +0000 (09:48 -0700)] 
Fix a log message typo

14 years agoLog the source of a rejected POSTed v3 vote
Robert Ransom [Tue, 15 Mar 2011 16:13:25 +0000 (09:13 -0700)] 
Log the source of a rejected POSTed v3 vote

Related to ticket 2683.

14 years agoCheck newconn, not conn, before marking newconn for close
Nick Mathewson [Mon, 14 Mar 2011 22:52:15 +0000 (18:52 -0400)] 
Check newconn, not conn, before marking newconn for close

This fixes bug 2757.  It's a bugfix on 85da676108f0d.

14 years agoConsider sending stream-level SENDME cells on partial flushes.
Nick Mathewson [Mon, 14 Mar 2011 21:48:45 +0000 (17:48 -0400)] 
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.

14 years agoMerge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Nick Mathewson [Mon, 14 Mar 2011 21:04:53 +0000 (17:04 -0400)] 
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

14 years agoMerge remote branch 'arma/bug2510' into maint-0.2.2
Nick Mathewson [Mon, 14 Mar 2011 20:14:54 +0000 (16:14 -0400)] 
Merge remote branch 'arma/bug2510' into maint-0.2.2

14 years agoMerge branch 'bug2511' into bug2510
Roger Dingledine [Mon, 14 Mar 2011 19:52:53 +0000 (15:52 -0400)] 
Merge branch 'bug2511' into bug2510

14 years agoMerge remote branch 'arma/bug2716' into maint-0.2.2
Nick Mathewson [Mon, 14 Mar 2011 19:29:02 +0000 (15:29 -0400)] 
Merge remote branch 'arma/bug2716' into maint-0.2.2

14 years agofix two issues pointed out by nickm
Roger Dingledine [Sun, 13 Mar 2011 20:56:41 +0000 (16:56 -0400)] 
fix two issues pointed out by nickm

14 years agowe're not reachable if we don't have a routerinfo yet
Roger Dingledine [Sun, 13 Mar 2011 19:47:59 +0000 (15:47 -0400)] 
we're not reachable if we don't have a routerinfo yet

14 years agofix one more typo
Roger Dingledine [Sun, 13 Mar 2011 19:22:45 +0000 (15:22 -0400)] 
fix one more typo

14 years agoTweak bug2716 patch a little
Nick Mathewson [Sat, 12 Mar 2011 05:19:52 +0000 (00:19 -0500)] 
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. ;)

14 years agoMerge branch 'hsdir_assignment' into maint-0.2.2
Nick Mathewson [Sat, 12 Mar 2011 04:30:25 +0000 (23:30 -0500)] 
Merge branch 'hsdir_assignment' into maint-0.2.2

14 years agoClarify threat description and avoid negative uptimes.
Nick Mathewson [Fri, 11 Mar 2011 18:03:25 +0000 (13:03 -0500)] 
Clarify threat description and avoid negative uptimes.

14 years agoimprove accuracy for when a relay went unreachable
Roger Dingledine [Sat, 12 Mar 2011 03:12:15 +0000 (22:12 -0500)] 
improve accuracy for when a relay went unreachable

14 years agoMerge commit 'sebastian/bug2663' into maint-0.2.2
Roger Dingledine [Sat, 12 Mar 2011 01:37:21 +0000 (20:37 -0500)] 
Merge commit 'sebastian/bug2663' into maint-0.2.2

14 years agoMerge branch 'maint-0.2.1' into maint-0.2.2
Roger Dingledine [Fri, 11 Mar 2011 22:39:54 +0000 (17:39 -0500)] 
Merge branch 'maint-0.2.1' into maint-0.2.2

14 years agoput the 0.2.1.30 changes into releasenotes
Roger Dingledine [Fri, 11 Mar 2011 22:38:55 +0000 (17:38 -0500)] 
put the 0.2.1.30 changes into releasenotes

14 years agoUse observed instead of declared uptime for HSDir
Sebastian Hahn [Wed, 9 Mar 2011 10:34:04 +0000 (11:34 +0100)] 
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.