]> git.ipfire.org Git - thirdparty/tor.git/log
thirdparty/tor.git
13 years agoFix spaces from last patch
Nick Mathewson [Thu, 9 Aug 2012 20:02:57 +0000 (16:02 -0400)] 
Fix spaces from last patch

13 years agoDon't infer we have a FooPort from the presence of a FooPort line
Nick Mathewson [Thu, 9 Aug 2012 19:48:43 +0000 (15:48 -0400)] 
Don't infer we have a FooPort from the presence of a FooPort line

Thanks to the changes we started making with SocksPort and friends
in 0.2.3.3-alpha, any of our code that did "if (options->Sockport)"
became wrong, since "SocksPort 0" would make that test true whereas
using the default SocksPort value would make it false.  (We didn't
actually do "if (options->SockPort)" but we did have tests for
TransPort.  When we moved DirPort, ORPort, and ControlPort over to
the same system in 0.2.3.9-alpha, the problem got worse, since our
code is littered with checks for DirPort and ORPort as booleans.

This code renames the current linelist-based FooPort options to
FooPort_lines, and adds new FooPort_set options which get set at
parse-and-validate time on the or_options_t.  FooPort_set is true
iff we will actually try to open a listener of the given type. (I
renamed the FooPort options rather than leave them alone so that
every previous user of a FooPort would need to get inspected, and so
that any new code that forgetfully uses FooPort will need fail to
compile.)

Fix for bug 6507.

13 years agoMerge remote-tracking branch 'public/bug6252_again' into maint-0.2.3
Nick Mathewson [Thu, 9 Aug 2012 14:50:11 +0000 (10:50 -0400)] 
Merge remote-tracking branch 'public/bug6252_again' into maint-0.2.3

13 years agoMerge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
Nick Mathewson [Fri, 3 Aug 2012 16:04:11 +0000 (12:04 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

Conflicts:
src/or/routerlist.c

13 years agoTry to clarify impact of bug 6537
Nick Mathewson [Fri, 3 Aug 2012 15:54:11 +0000 (11:54 -0400)] 
Try to clarify impact of bug 6537

I don't personally agree that this is likely to be easy to exploit,
and some initial experimention I've done suggests that cache-miss
times are just plain too fast to get useful info out of when they're
mixed up with the rest of Tor's timing noise.  Nevertheless, I'm
leaving Robert's initial changelog entry in the git history so that he
can be the voice of reason if I'm wrong. :)

13 years agoMitigate a side-channel leak of which relays Tor chooses for a circuit
Robert Ransom [Thu, 14 Jun 2012 17:15:54 +0000 (17:15 +0000)] 
Mitigate a side-channel leak of which relays Tor chooses for a circuit

Tor's and OpenSSL's current design guarantee that there are other leaks,
but this one is likely to be more easily exploitable, and is easy to fix.

13 years agoRemove bogus comment claiming that an assertion is triggerable by consensus
Robert Ransom [Thu, 14 Jun 2012 15:41:11 +0000 (15:41 +0000)] 
Remove bogus comment claiming that an assertion is triggerable by consensus

13 years agoMerge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
Nick Mathewson [Fri, 3 Aug 2012 15:18:40 +0000 (11:18 -0400)] 
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

13 years agoClarify security impact of bug 6530
Nick Mathewson [Fri, 3 Aug 2012 15:16:13 +0000 (11:16 -0400)] 
Clarify security impact of bug 6530

13 years agoAvoid possible segfault when handling networkstatus vote with bad flavor
Nick Mathewson [Fri, 3 Aug 2012 14:53:00 +0000 (10:53 -0400)] 
Avoid possible segfault when handling networkstatus vote with bad flavor

Fix for 6530; fix on 0.2.2.6-alpha.

13 years agoMerge branch 'bug6480_squashed' into maint-0.2.3
Nick Mathewson [Tue, 31 Jul 2012 21:19:47 +0000 (17:19 -0400)] 
Merge branch 'bug6480_squashed' into maint-0.2.3

13 years agoAvoid hard (impossible?)-to-trigger double-free in dns_resolve()
Nick Mathewson [Tue, 31 Jul 2012 16:58:19 +0000 (12:58 -0400)] 
Avoid hard (impossible?)-to-trigger double-free in dns_resolve()

Fixes 6480; fix on 0.2.0.1-alpha; based on pseudonymous patch.

13 years agochangelog for bug6043
Nick Mathewson [Tue, 31 Jul 2012 15:49:20 +0000 (11:49 -0400)] 
changelog for bug6043

13 years agoFixes/beautification of RPM spec. Tiny improvements in RPM build docs.
Ondrej Mikle [Thu, 21 Jun 2012 16:26:05 +0000 (18:26 +0200)] 
Fixes/beautification of RPM spec. Tiny improvements in RPM build docs.

13 years agoFixed creating _tor user in RPM-based installs.
Ondrej Mikle [Sat, 16 Jun 2012 20:41:59 +0000 (22:41 +0200)] 
Fixed creating _tor user in RPM-based installs.

13 years agoWorkaround for building EL5 RPMs by specifying rpmbuild-md5. Updated old note about...
Ondrej Mikle [Sat, 16 Jun 2012 16:38:14 +0000 (18:38 +0200)] 
Workaround for building EL5 RPMs by specifying rpmbuild-md5. Updated old note about using static libevent when building RPMs.

13 years agoCleanup of RPM build process - no more .git in tarball, use automake's dist-gzip...
Ondrej Mikle [Fri, 15 Jun 2012 21:59:35 +0000 (23:59 +0200)] 
Cleanup of RPM build process - no more .git in tarball, use automake's dist-gzip to create the tarball.

Signed-off-by: Ondrej Mikle <ondrej.mikle@gmail.com>
13 years agoDependencies for RPM building with mock should work now
Ondrej Mikle [Fri, 8 Jun 2012 13:41:53 +0000 (15:41 +0200)] 
Dependencies for RPM building with mock should work now

13 years agoMerge branch 'bug6490_v2' into maint-0.2.3
Nick Mathewson [Tue, 31 Jul 2012 14:28:43 +0000 (10:28 -0400)] 
Merge branch 'bug6490_v2' into maint-0.2.3

13 years agoWarn when accounting is used in a way likely to link hidden services
Nick Mathewson [Mon, 30 Jul 2012 15:58:55 +0000 (11:58 -0400)] 
Warn when accounting is used in a way likely to link hidden services

Fix for 6490.

13 years agoFix some manpage typos
Nick Mathewson [Tue, 31 Jul 2012 14:16:03 +0000 (10:16 -0400)] 
Fix some manpage typos

This is based on a pair of patches from A. Costa. I couldn't apply
those directly, since they changed the generated *roff files, not
the asciidoc source.

Fixes Tor bug 6500 and Debian bug 683359.

13 years agotrivial grammar fix
Roger Dingledine [Tue, 31 Jul 2012 09:10:05 +0000 (05:10 -0400)] 
trivial grammar fix

13 years agoMerge remote-tracking branch 'asn/bug6274_take3' into maint-0.2.3
Nick Mathewson [Mon, 23 Jul 2012 16:35:23 +0000 (12:35 -0400)] 
Merge remote-tracking branch 'asn/bug6274_take3' into maint-0.2.3

13 years agochanges file for bug 6436.
Nick Mathewson [Fri, 20 Jul 2012 13:50:19 +0000 (09:50 -0400)] 
changes file for bug 6436.

13 years agoClarify how to build asciidoc files using homebrew on Mac OS X
Steven Murdoch [Fri, 20 Jul 2012 13:29:20 +0000 (14:29 +0100)] 
Clarify how to build asciidoc files using homebrew on Mac OS X

13 years agoBetter handling of server managed proxies when Tor is not a relay.
George Kadianakis [Wed, 18 Jul 2012 18:01:02 +0000 (20:01 +0200)] 
Better handling of server managed proxies when Tor is not a relay.

13 years agoHave the bug6252 commit message reflect its on-again/off-again status
Nick Mathewson [Wed, 18 Jul 2012 14:24:17 +0000 (10:24 -0400)] 
Have the bug6252 commit message reflect its on-again/off-again status

13 years agoDetect bug 6252 (unexpected sendme cell)
Roger Dingledine [Thu, 28 Jun 2012 18:00:01 +0000 (14:00 -0400)] 
Detect bug 6252 (unexpected sendme cell)

I only check on circuits, not streams, since bloating your stream
window past the initial circuit window can't help you much.

Also, I compare to CIRCWINDOW_START_MAX so we don't have surprising
races if we lower CIRCWINDOW_START for an experiment.

13 years agoMerge branch 'smartlist_shorten' into maint-0.2.3
Nick Mathewson [Wed, 18 Jul 2012 14:14:14 +0000 (10:14 -0400)] 
Merge branch 'smartlist_shorten' into maint-0.2.3

13 years agoTweaks to 6400 changes file and docs as suggested by arma
Nick Mathewson [Wed, 18 Jul 2012 14:12:19 +0000 (10:12 -0400)] 
Tweaks to 6400 changes file and docs as suggested by arma

13 years agoImprove message on spurious SOCKSListenAddress
Nick Mathewson [Tue, 17 Jul 2012 16:02:55 +0000 (12:02 -0400)] 
Improve message on spurious SOCKSListenAddress

13 years agoFix the remaining instances of nexted SMARTLIST_FOREACH
Nick Mathewson [Tue, 17 Jul 2012 14:41:24 +0000 (10:41 -0400)] 
Fix the remaining instances of nexted SMARTLIST_FOREACH

13 years agoChange all SMARTLIST_FOREACH loops of >=10 lines to use BEGIN/END
Nick Mathewson [Tue, 17 Jul 2012 13:33:38 +0000 (09:33 -0400)] 
Change all SMARTLIST_FOREACH loops of >=10 lines to use BEGIN/END

The SMARTLIST_FOREACH macro is more convenient than BEGIN/END when
you have a nice short loop body, but using it for long bodies makes
your preprocessor tell the compiler that all the code is on the same
line.  That causes grief, since compiler warnings and debugger lines
will all refer to that one line.

So, here's a new style rule: SMARTLIST_FOREACH blocks need to be
short.

13 years agoAllow TestingTorNetwork when alternate dir and bridge authorities are set.
Linus Nordberg [Wed, 11 Jul 2012 09:53:07 +0000 (11:53 +0200)] 
Allow TestingTorNetwork when alternate dir and bridge authorities are set.

Allow TestingTorNetwork when AlternateDirAuthority and
AlternateBridgeAuthority is set even if DirServer is not.

13 years agoRefer to the correct variable in a loop when parsing entry guard state
Nick Mathewson [Mon, 16 Jul 2012 15:49:45 +0000 (11:49 -0400)] 
Refer to the correct variable in a loop when parsing entry guard state

Fixes bug 6397 and coverity issue 709599. Bugfix on 0.2.3.17-beta.

13 years agoCoverity 709056: Check return value on fputs in tor-gencert
Nick Mathewson [Mon, 16 Jul 2012 15:38:39 +0000 (11:38 -0400)] 
Coverity 709056: Check return value on fputs in tor-gencert

13 years agoImprove Alternate*Authority docs. Bug 6387.
Nick Mathewson [Mon, 16 Jul 2012 15:21:20 +0000 (11:21 -0400)] 
Improve Alternate*Authority docs. Bug 6387.

13 years agoMerge branch 'maint-0.2.2' into maint-0.2.3
Roger Dingledine [Fri, 6 Jul 2012 20:31:40 +0000 (16:31 -0400)] 
Merge branch 'maint-0.2.2' into maint-0.2.3

13 years agoRevert to the May 2012 geoip db
Roger Dingledine [Fri, 6 Jul 2012 20:29:51 +0000 (16:29 -0400)] 
Revert to the May 2012 geoip db

The June 2012 db marks too many relays as country "A1".
Addresses bug 6334.

13 years agoMerge remote-tracking branch 'nickm/bug6271_part_a' into maint-0.2.3
Roger Dingledine [Fri, 6 Jul 2012 12:57:29 +0000 (08:57 -0400)] 
Merge remote-tracking branch 'nickm/bug6271_part_a' into maint-0.2.3

13 years agoFix port range in parse_port_range().
George Kadianakis [Fri, 22 Jun 2012 15:24:06 +0000 (18:24 +0300)] 
Fix port range in parse_port_range().

13 years agoFix a bug handling SENDME cells on nonexistent streams.
Nick Mathewson [Fri, 6 Jul 2012 11:29:54 +0000 (07:29 -0400)] 
Fix a bug handling SENDME cells on nonexistent streams.

This could result in bizarre window values. Report and patch
contributed pseudymously.  Fixes part of bug 6271. This bug was
introduced before the first Tor release, in svn commit r152.

(bug 6271, part a.)

13 years agoOn windows, ENOBUFS starts with WSA. #6296. Fix on 0.2.18-rc
Nick Mathewson [Thu, 5 Jul 2012 09:01:00 +0000 (05:01 -0400)] 
On windows, ENOBUFS starts with WSA. #6296. Fix on 0.2.18-rc

13 years agoRevert "Detect bug 6252 (unexpected sendme cell)"
Roger Dingledine [Sun, 1 Jul 2012 21:36:35 +0000 (17:36 -0400)] 
Revert "Detect bug 6252 (unexpected sendme cell)"

This reverts commit c32ec9c425e9539bcc8ede95612e2d331c2cc2dd.

It turns out the two sides of the circuit don't actually stay in sync,
so it is perfectly normal for the circuit window on the exit relay to
grow to 2000+. We should fix that bug and then reconsider this patch.

13 years agoDetect bug 6252 (unexpected sendme cell)
Roger Dingledine [Thu, 28 Jun 2012 18:00:01 +0000 (14:00 -0400)] 
Detect bug 6252 (unexpected sendme cell)

I only check on circuits, not streams, since bloating your stream
window past the initial circuit window can't help you much.

Also, I compare to CIRCWINDOW_START_MAX so we don't have surprising
races if we lower CIRCWINDOW_START for an experiment.

13 years agobump version to 0.2.3.18-rc-dev
Nick Mathewson [Thu, 28 Jun 2012 20:01:55 +0000 (16:01 -0400)] 
bump version to 0.2.3.18-rc-dev

13 years agobump to 0.2.3.18-rc tor-0.2.3.18-rc
Roger Dingledine [Thu, 28 Jun 2012 19:34:33 +0000 (15:34 -0400)] 
bump to 0.2.3.18-rc

13 years agoadd a blurb for 0.2.3.18-rc, other minor cleanups
Roger Dingledine [Thu, 28 Jun 2012 19:32:36 +0000 (15:32 -0400)] 
add a blurb for 0.2.3.18-rc, other minor cleanups

13 years agofix grammar in comment
Roger Dingledine [Thu, 28 Jun 2012 17:43:01 +0000 (13:43 -0400)] 
fix grammar in comment

13 years agofold in more changes entries
Roger Dingledine [Thu, 28 Jun 2012 17:42:30 +0000 (13:42 -0400)] 
fold in more changes entries

13 years agoClean up check-spaces block; make it cover the right files
Nick Mathewson [Thu, 28 Jun 2012 15:04:52 +0000 (11:04 -0400)] 
Clean up check-spaces block; make it cover the right files

13 years agoMerge remote-tracking branch 'public/bug6244_part2' into maint-0.2.3
Nick Mathewson [Thu, 28 Jun 2012 14:49:32 +0000 (10:49 -0400)] 
Merge remote-tracking branch 'public/bug6244_part2' into maint-0.2.3

13 years agoAdd version and bug number to 5238 changes file
Nick Mathewson [Thu, 28 Jun 2012 14:45:56 +0000 (10:45 -0400)] 
Add version and bug number to 5238 changes file

13 years agoDowngrade 'Got a certificate, but we already have it' log message from warning to...
Andrea Shepard [Thu, 28 Jun 2012 07:21:06 +0000 (00:21 -0700)] 
Downgrade 'Got a certificate, but we already have it' log message from warning to info, except when we're a dirauth (fixes bug 5238)

13 years agoFix GETINFO address-mappings/... with wildcarded addresses.
Nick Mathewson [Thu, 28 Jun 2012 03:55:01 +0000 (23:55 -0400)] 
Fix GETINFO address-mappings/... with wildcarded addresses.

13 years agoAllow wildcarded mapaddress targets in controller MAPADDRESS command
Nick Mathewson [Thu, 28 Jun 2012 03:38:04 +0000 (23:38 -0400)] 
Allow wildcarded mapaddress targets in controller MAPADDRESS command

13 years agomerge changes files into upcoming changelog
Roger Dingledine [Thu, 28 Jun 2012 01:32:17 +0000 (21:32 -0400)] 
merge changes files into upcoming changelog

13 years agoMerge remote-tracking branch 'public/bug6227' into maint-0.2.3
Nick Mathewson [Tue, 26 Jun 2012 15:03:56 +0000 (11:03 -0400)] 
Merge remote-tracking branch 'public/bug6227' into maint-0.2.3

13 years agoFix a warning when using glibc's strcspn with clang.
Nick Mathewson [Tue, 26 Jun 2012 14:55:23 +0000 (10:55 -0400)] 
Fix a warning when using glibc's strcspn with clang.

With glibc 2.15 and clang 3.0, I get warnings from where we use the
strcpsn implementation in the header as strcspn(string, "=").  This
is apparently because clang sees that part of the strcspn macro
expands to "="[2], and doesn't realize that that part of the macro
is only evaluated when "="[1] != 0.

13 years agoAdd a unit test for environment_variable_names_equal
Nick Mathewson [Tue, 26 Jun 2012 14:50:37 +0000 (10:50 -0400)] 
Add a unit test for environment_variable_names_equal

I need this because I'm about to frob that function to stop using
strcspn() in order to get rid of a clang warning.

13 years agoFix a compilation warning with clang 3.0
Nick Mathewson [Tue, 26 Jun 2012 14:48:31 +0000 (10:48 -0400)] 
Fix a compilation warning with clang 3.0

In b1ad1a1d0266a20bb we introduced an implicit (but safe)
long-to-int shortening that clang didn't like.

Warning not in any released version of Tor.

13 years agoDowngrade message about md cache cleaning from notice to info
Nick Mathewson [Tue, 26 Jun 2012 14:30:11 +0000 (10:30 -0400)] 
Downgrade message about md cache cleaning from notice to info

Fix for #6238

13 years agoBump the test util/threads timeout up to 150 sec
Nick Mathewson [Mon, 25 Jun 2012 17:44:34 +0000 (13:44 -0400)] 
Bump the test util/threads timeout up to 150 sec

This should make some debian build systems happier.

Also, increase the select() timeout to a more reasonable 100 msec.

13 years agoDon't do DNS lookups when parsing corrupted managed proxy messages.
George Kadianakis [Mon, 25 Jun 2012 15:30:15 +0000 (18:30 +0300)] 
Don't do DNS lookups when parsing corrupted managed proxy messages.

The functions parse_{s,c}method_line() were using
tor_addr_port_lookup() which is capable of doing DNS lookups. DNS
lookups should not be necessary when parsing {C,S}METHOD lines.

13 years agoMerge remote-tracking branch 'public/bug6225' into maint-0.2.3
Nick Mathewson [Mon, 25 Jun 2012 15:51:19 +0000 (11:51 -0400)] 
Merge remote-tracking branch 'public/bug6225' into maint-0.2.3

13 years agoCatch a few more K&R violations with make check-spaces
Nick Mathewson [Sat, 23 Jun 2012 19:51:48 +0000 (15:51 -0400)] 
Catch a few more K&R violations with make check-spaces

We now catch bare {s that should be on the previous line with a do,
while, if, or for, and elses that should share a line with their
preceding }.

That is,
    if (foo)
    {
and
    if (foo) {
      ...
    }
    else

are now detected.

We should think about maybe making Tor uncrustify-clean some day,
but configuring uncrustify is an exercise in bizarreness, and
reformatting huge gobs of Tor is always painful.

13 years agofix broken utf8-ism
Roger Dingledine [Sat, 23 Jun 2012 19:42:18 +0000 (15:42 -0400)] 
fix broken utf8-ism

13 years agoDon't assert in get_string_from_pipe() on len==0
Nick Mathewson [Sat, 23 Jun 2012 19:35:43 +0000 (15:35 -0400)] 
Don't assert in get_string_from_pipe() on len==0

We can treat this case as an EAGAIN (probably because of an
unexpected internal NUL) rather than a crash-worthy problem.

Fixes bug 6225, again.  Bug not in any released version of Tor.

13 years agoResolve crash caused by format_helper_exit_status changes in #5557
Nick Mathewson [Sat, 23 Jun 2012 19:30:01 +0000 (15:30 -0400)] 
Resolve crash caused by format_helper_exit_status changes in #5557

Because the string output was no longer equal in length to
HEX_ERRNO_SIZE, the write() call would add some extra spaces and
maybe a NUL, and the NUL would trigger an assert in
get_string_from_pipe.

Fixes bug 6225; bug not in any released version of Tor.

13 years agoMerge branch 'bug5099_nm' into maint-0.2.3
Nick Mathewson [Sat, 23 Jun 2012 19:10:57 +0000 (15:10 -0400)] 
Merge branch 'bug5099_nm' into maint-0.2.3

13 years agoTweak bug5099 changes file
Nick Mathewson [Sat, 23 Jun 2012 19:10:43 +0000 (15:10 -0400)] 
Tweak bug5099 changes file

13 years agoImprove log message issued when a managed proxy fails to launch.
George Kadianakis [Sat, 23 Jun 2012 14:36:16 +0000 (17:36 +0300)] 
Improve log message issued when a managed proxy fails to launch.

13 years agoMerge remote-tracking branch 'public/bug6211' into maint-0.2.3
Nick Mathewson [Sat, 23 Jun 2012 02:38:59 +0000 (22:38 -0400)] 
Merge remote-tracking branch 'public/bug6211' into maint-0.2.3

13 years agoMerge remote-tracking branch 'public/bug6203_v2' into maint-0.2.3
Nick Mathewson [Sat, 23 Jun 2012 02:33:14 +0000 (22:33 -0400)] 
Merge remote-tracking branch 'public/bug6203_v2' into maint-0.2.3

13 years agoStyle tweaks and add a warning about NUL-termination
Nick Mathewson [Sat, 23 Jun 2012 02:17:24 +0000 (22:17 -0400)] 
Style tweaks and add a warning about NUL-termination

13 years agoAdd unit test for format_hex_number_for_helper_exit_status()
Andrea Shepard [Thu, 21 Jun 2012 01:38:07 +0000 (18:38 -0700)] 
Add unit test for format_hex_number_for_helper_exit_status()

13 years agoRefactor unsigned int hex formatting out of format_helper_exit_status() in util.c
Andrea Shepard [Wed, 20 Jun 2012 21:43:50 +0000 (14:43 -0700)] 
Refactor unsigned int hex formatting out of format_helper_exit_status() in util.c

13 years agoMake format_helper_exit_status() avoid unnecessary spaces
Andrea Shepard [Tue, 19 Jun 2012 11:07:30 +0000 (04:07 -0700)] 
Make format_helper_exit_status() avoid unnecessary spaces

13 years agoFix a regression bug in AllowDotExit
Nick Mathewson [Tue, 19 Jun 2012 23:45:28 +0000 (19:45 -0400)] 
Fix a regression bug in AllowDotExit

The code that detected the source of a remapped address checked that
an address mapping's source was a given rewrite rule if addr_orig had
no .exit, and addr did have a .exit after processing that rule.  But
addr_orig was formatted for logging: it was not the original address
at all, but rather was the address escaped for logging and possibly
replaced with "[scrubbed]".

This new logic will correctly set ADDRMAPSRC_NONE in the case when the
address starts life as a .exit address, so that AllowDotExit can work
again.

Fixes bug 6211; bugfix on 0.2.3.17-beta

13 years agoDisable warning for marked-but-reading in main.c
Nick Mathewson [Tue, 19 Jun 2012 15:48:03 +0000 (11:48 -0400)] 
Disable warning for marked-but-reading in main.c

It turns out this can happen.  Even though there is no reason for
connections to be marked but reading, we leave them reading anyway,
so warning here is unwarranted.  Let's turn that back on once we do
something sensible and disable reading when we mark.  Bugfix for
6203 on Tor 0.2.3.17-beta.

Thanks to cypherpunks for pointing out the general stupidity of the
original code here.

13 years agoMerge remote-tracking branch 'public/bug3311'
Nick Mathewson [Mon, 18 Jun 2012 16:07:39 +0000 (12:07 -0400)] 
Merge remote-tracking branch 'public/bug3311'

13 years agoMerge branch 'bug4748_squashed'
Nick Mathewson [Mon, 18 Jun 2012 16:01:56 +0000 (12:01 -0400)] 
Merge branch 'bug4748_squashed'

13 years agoDocument 0.2.3.x torrc/default-torrc/command line semantics changes
Nick Mathewson [Fri, 15 Jun 2012 20:41:30 +0000 (16:41 -0400)] 
Document 0.2.3.x torrc/default-torrc/command line semantics changes

Bug 4748

squash! Document 0.2.3.x torrc/default-torrc/command line semantics changes

Incorporates fixes suggested by rransom.

13 years agoMerge branch 'bug6173_rebased'
Nick Mathewson [Mon, 18 Jun 2012 15:52:03 +0000 (11:52 -0400)] 
Merge branch 'bug6173_rebased'

13 years agoMerge remote-tracking branch 'andrea/bug6028'
Nick Mathewson [Mon, 18 Jun 2012 15:51:55 +0000 (11:51 -0400)] 
Merge remote-tracking branch 'andrea/bug6028'

13 years agooops: AC_RUN_IFELSE gets offended if I don't give it a AC_LANG_PROGRAM
Nick Mathewson [Mon, 18 Jun 2012 15:47:05 +0000 (11:47 -0400)] 
oops: AC_RUN_IFELSE gets offended if I don't give it a AC_LANG_PROGRAM

13 years agoMore sophisticated attempt at detecting working linker options
Nick Mathewson [Sat, 16 Jun 2012 01:04:07 +0000 (21:04 -0400)] 
More sophisticated attempt at detecting working linker options

On some platforms, the linker is perfectly happy to produce binaries
that won't run if you give it the wrong set of flags.  So when not
cross-compiling, try to link-and-run a little test program, rather
than just linking it.

Possible fix for 6173.

13 years agoconn_type_to_string() on a listener already says it's a listener
Roger Dingledine [Sat, 16 Jun 2012 06:29:03 +0000 (02:29 -0400)] 
conn_type_to_string() on a listener already says it's a listener

13 years agofix the typo on the typo fix
Roger Dingledine [Sat, 16 Jun 2012 00:34:16 +0000 (20:34 -0400)] 
fix the typo on the typo fix

13 years agoAlways set *socket_error to something appropriate when returning -1 from connection_c...
Andrea Shepard [Fri, 15 Jun 2012 23:53:32 +0000 (16:53 -0700)] 
Always set *socket_error to something appropriate when returning -1 from connection_connect()

13 years agofix typos from 783f705d
Roger Dingledine [Fri, 15 Jun 2012 21:08:25 +0000 (17:08 -0400)] 
fix typos from 783f705d

13 years agofix a compiler warning added in one of my XXX023 fixes.
Nick Mathewson [Fri, 15 Jun 2012 20:43:59 +0000 (16:43 -0400)] 
fix a compiler warning added in one of my XXX023 fixes.

13 years agoWhitespace fix
Nick Mathewson [Fri, 15 Jun 2012 20:12:24 +0000 (16:12 -0400)] 
Whitespace fix

13 years agoFix a typo found by Mike.
Nick Mathewson [Fri, 15 Jun 2012 20:12:04 +0000 (16:12 -0400)] 
Fix a typo found by Mike.

13 years agoMerge remote-tracking branch 'public/xxx023'
Nick Mathewson [Fri, 15 Jun 2012 20:10:59 +0000 (16:10 -0400)] 
Merge remote-tracking branch 'public/xxx023'

13 years agoClarify some messages about publishing hidden service descriptors
Nick Mathewson [Fri, 15 Jun 2012 19:25:46 +0000 (15:25 -0400)] 
Clarify some messages about publishing hidden service descriptors

Fix for bug 3311.

13 years agoCheck the correct consensus before giving it to the client
Nick Mathewson [Fri, 15 Jun 2012 14:50:41 +0000 (10:50 -0400)] 
Check the correct consensus before giving it to the client

Previously, a directory would check the latest NS consensus for
having the signatures the client wanted, and use that consensus's
valid_until time to set the HTTP lifetime.  With this patch, the
directory looks at NS consensus or the microdesc consensus,
depending on what the client asked for.

13 years agoChange a silent ignore-the-bug in microdesc.c to a LOG_INFO
Nick Mathewson [Fri, 15 Jun 2012 14:40:37 +0000 (10:40 -0400)] 
Change a silent ignore-the-bug in microdesc.c to a LOG_INFO

I don't believe this bug occurs, but there was an XXX023 to make
sure it doesn't.

13 years agoMove tor_gettimeofday_cached() into compat_libevent
Nick Mathewson [Fri, 15 Jun 2012 14:31:34 +0000 (10:31 -0400)] 
Move tor_gettimeofday_cached() into compat_libevent

13 years agoRefactor GETINFO process/descriptor-limit
Nick Mathewson [Fri, 15 Jun 2012 14:16:00 +0000 (10:16 -0400)] 
Refactor GETINFO process/descriptor-limit

Previously it duplicated some getrlimit code and content from compat.c;
now it doesn't.