aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* use my time machine to fix a few more typosRoger Dingledine2012-06-06
|
* bump to 0.2.3.16-alpha-devRoger Dingledine2012-06-05
|
* use my time machine to fix the changelogRoger Dingledine2012-06-05
|
* add a blurb for 0.2.3.16-alphaRoger Dingledine2012-06-05
|
* today is the day for 0.2.3.16-alphaRoger Dingledine2012-06-05
|
* start folding in the changes filesRoger Dingledine2012-06-05
|
* Merge branch 'bug5603'Nick Mathewson2012-06-05
|\
| * Changes file for bug 5603Nick Mathewson2012-06-05
| |
| * Minor changes to bug5603Nick Mathewson2012-06-05
| | | | | | | | | | | | * Minor stylistic changes to comments and doxygen * Use strcmp_opt; it already exists. * Tighten bridge_has_digest implementation a little.
| * Improve conflict resolution when adding new bridges.George Kadianakis2012-06-03
| |
* | Merge remote-tracking branch 'public/getfilesize_64'Nick Mathewson2012-06-05
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/compat.c The getfilesize change conflicted with the removal of file_handle from the windows tor_mmap_t.
| * | Use GetFileSize correctly on win32Nick Mathewson2012-05-24
| | | | | | | | | | | | | | | (Use its second parameter to find the high 32 bits of the file size; check its return value for error conditions.)
* | | Fix some mingw build warningsNick Mathewson2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | These include: - Having a weird in_addr that can't be initialized with {0} - Needing INVALID_HANDLE_VALUE instead of -1 for file handles. - Having a weird dependent definition for struct stat. - pid is signed, not unsigned.
* | | Revert "Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges"Nick Mathewson2012-06-05
| | | | | | | | | | | | | | | | | | This reverts commit 981e896dd2eaf69798bb503c271306ee779dd6d2. Apparently Karsten still needs DirReqStatistics for bridges; see
* | | Downgrade tor_assert(0) to tor_fragile_assert() in windows stub ↵Nick Mathewson2012-06-05
| | | | | | | | | | | | create_unix_sockaddr
* | | Merge remote-tracking branch 'public/bug3894'Nick Mathewson2012-06-05
|\ \ \
| * | | Fix some more FreeBSD4 issues (based on a patch from grarpamp)Nick Mathewson2012-05-16
| |/ / | | | | | | | | | | | | | | | | | | Apparently, freebsd 4 doesn't like malloc.h, needs sys/param.h for MIN/MAX, and doesn't have a SIZE_MAX. For bug 3894.
* | | Merge remote-tracking branch 'public/format_doubles'Nick Mathewson2012-06-05
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/or/geoip.c
| * | | Use %f, not %lf when formatting doublesNick Mathewson2012-05-16
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | %f is correct; %lf is only needed with scanf. Apparently, on some old BSDs, %lf is deprecated. Didn't we do this before? Yes, we did. But we only got the instances of %lf, not more complicated things like %.5lf . This patch tries to get everything. Based on a patch for 3894 by grarpamp.
* | | Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridgesNick Mathewson2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | These stats are currently discarded, but we might as well hard-disable them on bridges, to be clean. Fix for bug 5824; bugfix on 0.2.1.17-rc. Patch originally by Karsten Loesing.
* | | Merge remote-tracking branch 'public/bug4657'Nick Mathewson2012-06-05
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: src/or/router.c
| * | | Warn and ignore the MyFamily setting if BridgeRelay is also setNick Mathewson2012-05-24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Roger explains at http://archives.seul.org/tor/talk/Nov-2011/msg00209.html : "If you list your bridge as part of your family in the relay descriptor, then everybody can learn your bridge fingerprint, and they can look up your bridge's descriptor (and thus location) at the bridge directory authority." Now, we can't stop relays from listing bridges, but we can warn when we notice a bridge listing anybody, which might help some. This fixes bug 4657; it's a fix on 0.2.0.3-alpha, where bridges were first introduced.
* | | Merge remote-tracking branch 'public/bug4710'Nick Mathewson2012-06-05
|\ \ \
| * | | Report EADDRNOTAVAIL and EADDRINUSE as RESOURCELIMITNick Mathewson2012-05-16
| |/ / | | | | | | | | | | | | | | | | | | | | | These errors usually mean address exhaustion; reporting them as such lets clients adjust their load to try other exits. Fix for bug 4710; bugfix on 0.1.0.1-rc, which started using END_STREAM_REASON_RESOURCELIMIT.
* | | Fix "make check-spaces" issuesNick Mathewson2012-06-05
| | |
* | | Resolve about 24 DOCDOCsNick Mathewson2012-06-05
| | |
* | | Missing copyright/license statement for procmon.cNick Mathewson2012-06-04
| | |
* | | Update copyright dates to 2012; add a few missing copyright statementsNick Mathewson2012-06-04
| | |
* | | Add about 60 more DOCDOC comments to 0.2.3Nick Mathewson2012-06-04
| | | | | | | | | | | | | | | | | | | | | | | | Also, try to resolve some doxygen issues. First, define a magic "This is doxygen!" macro so that we take the correct branch in various #if/#else/#endifs in order to get the right documentation. Second, add in a few grouping @{ and @} entries in order to get some variables and fields to get grouped together.
* | | Update the "redox" doxygen/DOCDOC postprocessing scriptNick Mathewson2012-06-04
| | | | | | | | | | | | | | | | | | Somewhere along the line, doxygen and tor changed their behavior a little. The script is still a dreadful kludge, but now at least it sorta works again.
* | | Resolve some markup complaints from doxygenNick Mathewson2012-06-04
| | |
* | | Resolve all currently pending DOCDOC items in masterNick Mathewson2012-06-04
| | |
* | | Merge origin/maint-0.2.2 for 6007_strictNick Mathewson2012-06-04
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code shouldn't have any effect in 0.2.3, since we already accept (and handle) data received while we are expecting a renegotiation. (That's because the 0.2.3.x handshake _does_ have data there instead of the renegotiation.) I'm leaving it in anyway, since if it breaks anything, we'll want it broken in master too so we can find out about it. I added an XXX023 comment so that we can come back later and fix that.
| * \ \ Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2Nick Mathewson2012-06-04
| |\ \ \
| | * | | Kill non-open OR connections with any data on their inbufs.Nick Mathewson2012-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a DoS issue where a client could send so much data in 5 minutes that they exhausted the server's RAM. Fix for bug 5934 and 6007. Bugfix on 0.2.0.20-rc, which enabled the v2 handshake.
* | | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-06-04
|\| | | |
| * | | | Merge remote-tracking branch 'public/bug6033' into maint-0.2.2Nick Mathewson2012-06-04
| |\ \ \ \
| | * | | | Work around a bug in OpenSSL 1.0.1's TLS 1.1 and TLS 1.2 supportNick Mathewson2012-06-02
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that when OpenSSL negotiates a 1.1 or 1.2 connection, and it decides to renegotiate, the client will send a record with version "1.0" rather than with the current TLS version. This would cause the connection to fail whenever both sides had OpenSSL 1.0.1, and the v2 Tor handshake was in use. As a workaround, disable TLS 1.1 and TLS 1.2. When a later version of OpenSSL is released, we can make this conditional on running a fixed version of OpenSSL. Alternatively, we could disable TLS 1.1 and TLS 1.2 only on the client side. But doing it this way for now means that we not only fix TLS with patched clients; we also fix TLS when the server has this patch and the client does not. That could be important to keep the network running well. Fixes bug 6033.
* | | | | Fix build warning on Lenny about strtok_r unit testNick Mathewson2012-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a warning in efb8a09f, where Debain Lenny's GCC doesn't get that for (i=0; i<3; ++i) { const char *p; switch(i) { case 0: p="X"; break; case 1: p="Y"; break; case 2: p="Z"; break; } printf("%s\n", p); } will never try to print an uninitialezed value. Found by buildbots. Bug in no released versions of Tor.
* | | | | clarify that LongLivedPorts is for hidden services tooRoger Dingledine2012-06-03
| |_|_|/ |/| | |
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-05-31
|\| | |
| * | | add changes file for bug 5283Roger Dingledine2012-05-31
| | | | | | | | | | | | | | | | | | | | I called it a bugfix on 0.2.0.10-alpha, since git commit e5885deab is where we introduced anonymized begin_dir connections.
| * | | Make all begindir or one-hop circuits internalNick Mathewson2012-05-31
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | This solves bug 5283, where client traffic could get sent over the same circuit as an anonymized connection to a directory, even if that circuit used an exit node unsuitable for clients. By marking the directory connection as needs_internal, we ensure that the (non-internal!) client-traffic connection won't be sent over the same circuit.
* | | Merge remote-tracking branch 'public/bug5089'Nick Mathewson2012-05-31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/test/test_util.c Merge the unit tests; I added some when I did this branch against 0.2.2, and then the test format changed and master added more tests.
| * | | A few more get_parent_directory tests.Nick Mathewson2012-05-31
| | | |
| * | | Have get_parent_directory() handle "/foo" and "/" correctly.Nick Mathewson2012-05-24
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent of "/foo" is "/"; and "/" is its own parent. This would cause Tor to fail if you tried to have a PF_UNIX control socket in the root directory. That would be a stupid thing to do for other reasons, but there's no reason to fail like _this_. Bug found by Esteban Manchado Velázquez. Fix for bug 5089; bugfix on Tor 0.2.2.26-beta. Unit test included.
* | | Merge remote-tracking branch 'public/bug5374'Nick Mathewson2012-05-31
|\ \ \
| * | | Delay getsockname() call until after connect() is doneNick Mathewson2012-05-24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | On Windows, getsockname() on a nonblocking apparently won't work until the connection is done connecting. On XP, it seems to fail by reporting success and declaring that your address is INADDR_ANY. On the Win8 preview, though, it fails more loudly and says WSAEINVAL. Fix for bug 5374; bugfix on 0.1.1.14-alpha.
* | | Merge remote-tracking branch 'linus/bug4873_ln'Nick Mathewson2012-05-31
|\ \ \
| * | | Remove unexpected "unexpectedly".Linus Nordberg2012-05-31
| | | |