aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-12
|\
| * Remove various outdated documents.Nick Mathewson2013-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc/TODO and doc/spec/README were placeholders to tell people where to look for the real TODO and README stuff -- we replaced them years ago, though. authority-policy, v3-authority-howto, and torel-design.txt belong in torspec. I'm putting them in attic there since I think they may be in large part obsolete, but someone can rescue them if they're not. translations.txt is outdated, and refers to lots of programs other than Tor. We have much better translation resources on the website now. tor-win32-mingw-creation.txt is pending review of a revised version for 0.2.5 (see ticket #4520), but there's no reason to ship this one while we're waiting for an accurate version. the tor-rpm-creation.txt isn't obsolete AFAIK, but it belongs in doc/contrib if anywhere. Resolves bug #8965.
* | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-12
|\|
| * Merge remote-tracking branch 'andrea/bug8639_v3' into maint-0.2.4Nick Mathewson2013-06-12
| |\
| | * When launching a resolve request on behalf of an AF_UNIX control, omit the ↵Andrea Shepard2013-05-31
| | | | | | | | | | | | address field of the new entry connection. Fixes bug 8639.
* | | Issue #9043 - changelog entryMarek Majkowski2013-06-12
| | |
* | | Fix #9043 - simplyfy the code and use EVP_PKEY_cmp instead of pkey_eq / ↵Marek Majkowski2013-06-12
| | | | | | | | | | | | tor_tls_evp_pkey_eq
* | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-12
|\| |
| * | Revert "Use the FILE_SHARE_DELETE flag for CreateFile on a mapping"Nick Mathewson2013-06-12
| | | | | | | | | | | | | | | | | | | | | This reverts commit 884a0e269c382f9e927d8c8b1ef4ef9d2d48379d. I'm reverting this because it doesn't actually make the problem go away. It appears that instead we need to do unmap-then-replace.
* | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-12
|\| |
| * | Merge remote-tracking branch 'public/bug2077_share_delete' into maint-0.2.4Nick Mathewson2013-06-12
| |\ \
| | * | Use the FILE_SHARE_DELETE flag for CreateFile on a mappingNick Mathewson2013-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A comment by rransom on #8795 taken together with a comment by doorss recorded on #2077 suggest that *every* attempt to replace the md cache will fail on Vista/Win7 if we don't have the FILE_SHARE_DELETE flag passed to CreateFile, and if we try to replace the file ourselves before unmapping it. I'm adding the FILE_SHARE_DELETE, since that's this simplest fix. Broken indexers (the favored #2077 hypothesis) could still cause trouble here, but at least this patch should make us stop stepping on our own feet. Likely fix for #2077 and its numerous duplicates. Bugfix on 0.2.2.6-alpha, which first had a microdescriptor cache that would get replaced before remapping it.
| * | | Expand microdesc cache testsNick Mathewson2013-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Is it possible that *every* attempt to replace the microdesc cache on windows 7 is going to fail because of our lack of FILE_SHARE_DELETE while opening the file? If so, this test will catch #2077 and let us know when it's fixed.
* | | | Use double-quotes for regular_mans, not brackets.dana koch2013-06-12
| | | | | | | | | | | | | | | | | | | | | | | | This is a bashism; on systems where sh is not bash (eg., non-Linux, or Ubuntu using dash), this breaks with a syntax error. This also doesn't work properly in bash: only the first item is iterated on.
* | | | Fix tor-fw-helper exit code.Arlo Breault2013-06-10
| | | | | | | | | | | | | | | | | | | | | | | | It's returning the number of initialized backends. (changes file added by nickm; this is a fix for bug #9030)
* | | | Fix "make check-spaces"Nick Mathewson2013-06-10
| | | |
* | | | Make OPENSSL_free(dh_string_repr) conditional.Nick Mathewson2013-06-10
| | | |
* | | | Merge remote-tracking branch 'majek/bug5170'Nick Mathewson2013-06-10
|\ \ \ \
| * | | | Bug #5170 - make pkey_eq testable, introduce test_tortls.cMarek Majkowski2013-06-10
| | | | |
| * | | | Bug #5170 - test crypto_pk_get_all_digestsMarek Majkowski2013-06-10
| | | | |
| * | | | Bug 5170 - simplify i2d_PublicKey in pkey_eqMarek Majkowski2013-06-06
| | | | |
| * | | | Bug #5170 - simplify i2d_X509Marek Majkowski2013-06-06
| | | | |
| * | | | Bug #5170 - also simplify i2d_DHparamsMarek Majkowski2013-06-06
| | | | |
| * | | | Bug #5170 - i2d_RSAPublicKey supports allocating its own output bufferMarek Majkowski2013-06-06
| | | | |
| * | | | Bug #5170 - remove id_to_fp.c as it's not used anywhereMarek Majkowski2013-06-06
| | | | |
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-10
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-06-10
| |\| |
| | * | Merge branch 'bug9017' into maint-0.2.3Nick Mathewson2013-06-10
| | |\ \
| | | * | Fix (Open?)BSD fast-connect bug with optimistic data.Nick Mathewson2013-06-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's an assertion failure that can occur if a connection has optimistic data waiting, and then the connect() call returns 0 on the first attempt (rather than -1 and EINPROGRESS). That latter behavior from connect() appears to be an (Open?)BSDism when dealing with remote addresses in some cases. (At least, I've only seen it reported with the BSDs under libevent, even when the address was 127.0.0.1. And we've only seen this problem in Tor with OpenBSD.) Fixes bug 9017; bugfix on 0.2.3.1-alpha, which first introduced optimistic data. (Although you could also argue that the commented-out connection_start_writing in 155c9b80 back in 2002 is the real source of the issue.)
* | | | | Merge remote-tracking branch 'karsten/geoip-manual-update-jun2013'Nick Mathewson2013-06-05
|\ \ \ \ \
| * | | | | Remove 9 now unused manual A1 substitutions.Karsten Loesing2013-06-05
| | | | | |
* | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-05
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-06-05
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2013-06-05
| | |\ \ \ \
| | | * | | | Update to the June 2013 GeoIP database.Karsten Loesing2013-06-05
| | | | | | |
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-05
|\| | | | | | | |_|_|/ / / |/| | | | |
| * | | | | Fix two cut'n'paste docu bugs.Linus Nordberg2013-06-05
| | |_|_|/ | |/| | |
* | | | | Fix windows compilation warning in test_config.cNick Mathewson2013-05-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bugfix on 78cc5833a1da038331186ddf07f4add7f8f1094b; bug not in any released Tor. Spotted by weasel using Jenkins.
* | | | | Start correctly when not in testing mode.Nick Mathewson2013-05-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can't use != to compare arbitary members of or_options_t. (Also, generate a better error message to say which Testing* option was set.) Fix for bug 8992. Bugfix on b0d4ca49. Bug not in any released Tor.
* | | | | Merge remote-tracking branch 'karsten/task-6752-3'Nick Mathewson2013-05-28
|\ \ \ \ \
| * | | | | Try harder to document default_options correctly.Karsten Loesing2013-05-25
| | | | | |
| * | | | | Tweak #6752 patch based on comments by nickm.Karsten Loesing2013-05-24
| | | | | |
| * | | | | Lower dir fetch retry schedules in testing networks.Karsten Loesing2013-05-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also lower maximum interval without directory requests, and raise maximum download tries. Implements #6752.
* | | | | | double-quotes and changes file for 6506.Nick Mathewson2013-05-24
| | | | | |
* | | | | | Fix out-of-tree builds.Arlo Breault2013-05-24
| | | | | | | | | | | | | | | | | | | | | | | | See #6506
* | | | | | Config check for asciidoc and generated manpages.Arlo Breault2013-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If USE_ASCIIDOC is enabled but asciidoc isn't present and manpages aren't already generated, it'll throw a warning during configure. Works with the current git / tarball split. Caveat: regular_mans are listed in the configure.ac See #6506
* | | | | | Merge branch 'bug4282_rebased'Nick Mathewson2013-05-24
|\ \ \ \ \ \
| * | | | | | changes file for 4282Nick Mathewson2013-05-24
| | | | | | |
| * | | | | | Reformat 4282 fixes a littleNick Mathewson2013-05-24
| | | | | | |
| * | | | | | Fix a logic error in 4282 fixesNick Mathewson2013-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | check_or_create_data_subdir has succeeded when it returns 0, not when it returns negative.