Nick Mathewson
b97d9abd09
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-14 17:04:53 -04:00
Nick Mathewson
0588330c1d
Merge remote branch 'arma/bug2510' into maint-0.2.2
2011-03-14 16:14:54 -04:00
Roger Dingledine
cb101c4815
Merge branch 'bug2511' into bug2510
2011-03-14 15:52:53 -04:00
Nick Mathewson
b639add1a0
Merge remote branch 'arma/bug2716' into maint-0.2.2
2011-03-14 15:29:02 -04:00
Roger Dingledine
72b89c96bf
fix two issues pointed out by nickm
2011-03-13 16:56:41 -04:00
Roger Dingledine
1a9d19e972
we're not reachable if we don't have a routerinfo yet
2011-03-13 15:47:59 -04:00
Roger Dingledine
61f648ae37
fix one more typo
2011-03-13 15:22:45 -04:00
Nick Mathewson
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
Nick Mathewson
d34a5cdc59
Merge branch 'hsdir_assignment' into maint-0.2.2
2011-03-11 23:30:25 -05:00
Nick Mathewson
3a0c602155
Clarify threat description and avoid negative uptimes.
2011-03-11 23:27:53 -05:00
Roger Dingledine
977e396e86
improve accuracy for when a relay went unreachable
2011-03-11 22:12:15 -05:00
Roger Dingledine
600ad7bf8d
Merge commit 'sebastian/bug2663' into maint-0.2.2
2011-03-11 20:37:21 -05:00
Roger Dingledine
879f1718ad
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-03-11 17:39:54 -05:00
Roger Dingledine
151ab61442
put the 0.2.1.30 changes into releasenotes
2011-03-11 17:38:55 -05:00
Sebastian Hahn
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
Nick Mathewson
48c4d53281
Add a step to the release process: tell trac about the version.
2011-03-10 16:10:53 -05:00
Nick Mathewson
78d5955e5b
oops. I got the bug number wrong.
2011-03-09 16:22:18 -05:00
Andreas Stieger
f31ba6a356
openSUSE initscript create /var/run/tor fixes Ticket #2573
...
(changes file added by nickm)
2011-03-09 16:18:44 -05:00
Roger Dingledine
6426cd14f3
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-03-08 18:16:06 -05:00
Roger Dingledine
d080fe8db1
move to march 2011 geoip file
2011-03-08 18:15:17 -05:00
Nick Mathewson
00446973f2
Merge remote branch 'sebastian/bug2250' into maint-0.2.2
2011-03-08 16:13:28 -05:00
Roger Dingledine
dbd4a01756
steps roger takes when making a new release
2011-03-08 16:06:32 -05:00
Nick Mathewson
0d78a16c36
Merge remote branch 'sebastian/bug1035' into maint-0.2.2
2011-03-08 15:52:43 -05:00
Roger Dingledine
9c72324ae8
update spec locations
2011-03-08 15:31:04 -05:00
Nick Mathewson
9ad083d573
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-08 15:20:48 -05:00
Nick Mathewson
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
Roger Dingledine
95edd51116
make nickm's proposed convention from 2003 be gospel
2011-03-08 14:59:30 -05:00
Nick Mathewson
3bd83b8fb6
Merge remote branch 'sebastian/bug2660' into maint-0.2.2
2011-03-07 17:09:23 -05:00
Sebastian Hahn
2f8e96b553
Fix log message when we have too few dirauths
...
The calculation of when to send the logmessage was correct, but we
didn't give the correct number of relays required: We want more than
half of all authorities we know about. Fixes bug 2663.
2011-03-07 00:06:36 +01:00
Nick Mathewson
35fcec3880
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
2011-03-06 13:42:28 -05:00
Nick Mathewson
4fa70e11ed
Merge branch 'real_ipv6_fix' into maint-0.2.1
2011-03-06 13:42:05 -05:00
Nick Mathewson
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
Nick Mathewson
0f637492e3
Merge branch 'careful_with_all_descs' into maint-0.2.1
2011-03-06 13:35:42 -05:00
Nick Mathewson
b231026c42
changes file for careful_with_all_descs
2011-03-06 13:35:24 -05:00
Nick Mathewson
3da0837b0b
Revert "Disallow reject6 and accept6 lines in descriptors"
...
This reverts commit b3918b3bbb
2011-03-06 13:26:38 -05:00
Nick Mathewson
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
Nick Mathewson
8b01fd7bad
exit_policy_is_general_exit is IPv4 only; it should admit it.
2011-03-06 13:16:53 -05:00
Nick Mathewson
fb421c0005
Changes file for ipv6 parsing issue
2011-03-06 13:15:32 -05:00
Sebastian Hahn
9f614507b6
Merge branch 'maint-0.2.1' into maint-0.2.2
2011-03-06 18:25:44 +01:00
Sebastian Hahn
b3918b3bbb
Disallow reject6 and accept6 lines in descriptors
...
This fixes a remotely triggerable assert on directory authorities, who
don't handle descriptors with ipv6 contents well yet. We will want to
revert this once we're ready to handle ipv6.
Issue raised by lorth on #tor, who wasn't able to use Tor anymore.
Analyzed with help from Christian Fromme. Fix suggested by arma. Bugfix
on 0.2.1.3-alpha.
2011-03-06 18:20:28 +01:00
Sebastian Hahn
f83debb51d
Fix setting target port in get_interface_address6
...
We want to use the discard port correctly, so a htons() was missing.
Also we need to set it correctly depending on address family.
Review provided by danieldg
2011-03-05 16:58:20 +01:00
Sebastian Hahn
865ea5d263
Fix connect() failures in get_interface_address6()
...
The third argument for connect should be dependent on the address
family. Issue spotted by piebeer who also wrote the patch.
2011-03-05 16:57:05 +01:00
Nick Mathewson
bcbc8c51cb
Do not serve encrypt-only descriptors with the "all" request. Reported by piebeer
2011-03-04 00:04:25 -05:00
Nick Mathewson
1d6af67ab8
Merge remote branch 'rransom/typo-fix-2011-03-03-01' into maint-0.2.2
2011-03-03 13:50:17 -05:00
Robert Ransom
88e0de9ebb
Fix typo in man page
2011-03-03 10:41:39 -08:00
Nick Mathewson
6b7408178b
Avoid spurious bwhist parsing failures
...
This should fix a bug that special ran into, where if your state file
didn't record period maxima, it would never decide that it had
successfully parsed itself unless you got lucky with your
uninitialized-variable values.
This patch also tries to improve error messags in the case where a
maximum value legitimately doesn't parse.
2011-03-01 17:08:02 -05:00
Sebastian Hahn
5c7c5e593f
Tweak the bug2250 fix slightly
...
Rename the _UsingTestingTorNetwork hidden option to
_UsingTestNetworkDefaults (thanks Nick for the suggestion) and added a
changes file.
2011-03-01 10:05:18 +01:00
Sebastian Hahn
5a4f7fa1e4
clarify an assert
...
also log about running changes, even on a bridge authority.
2011-02-26 09:42:44 +01:00
Sebastian Hahn
34e47d1052
Fix GETINFO config-text for private networks
...
In private networks, the defaults for some options are changed. This
means that in options_validate(), where we're testing that the defaults
are what we think they are, we fail. Use a workaround by setting a
hidden configuration option _UsingTestingTorNetwork when we have altered
the configuration this way, so that options_validate() can do the right
thing.
Fixes bug 2250, bugfix on 0.2.1.2-alpha (the version introducing private
network options).
2011-02-26 09:11:41 +01:00
Nick Mathewson
aa178aae03
Merge branch 'bug1863_bwhist' into maint-0.2.2
2011-02-25 11:22:12 -05:00
