aboutsummaryrefslogtreecommitdiff
path: root/src/or
Commit message (Collapse)AuthorAge
* Remove validate_pluggable_transports_config(): redundant since 9d9b5ed0.George Kadianakis2012-06-14
| | | | | | The warning message of validate_pluggable_transports_config() is superseded by the changes in the warning message of connection_or_connect() when the proxy credentials can't be found.
* Merge branch 'bug5452'Nick Mathewson2012-06-11
|\
| * Make RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT warning tell the user how to fix it.Andrea Shepard2012-06-11
| |
| * Warn if the user has set CircuitBuildTimeout stupidly low and turned off ↵Andrea Shepard2012-06-08
| | | | | | | | LearnCircuitBuildTimeout
* | Merge remote-tracking branch 'public/bug5598'Nick Mathewson2012-06-11
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: doc/tor.1.txt Conflict was on a formatting issue in the manpage.
| * | Change the default for DynamicDHGroups to 0Nick Mathewson2012-06-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This feature can make Tor relays less identifiable by their use of the mod_ssl DH group, but at the cost of some usability (#4721) and bridge tracing (#6087) regressions. We should try to turn this on by default again if we find that the mod_ssl group is uncommon and/or we move to a different DH group size (see #6088). Before we can do so, we need a fix for bugs #6087 and Resolves ticket #5598 for now.
* | | Merge branch 'bug6097'Nick Mathewson2012-06-11
|\ \ \ | |_|/ |/| |
| * | Be more careful calling wcstombsNick Mathewson2012-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function is not guaranteed to NUL-terminate its output. It *is*, however, guaranteed not to generate more than two bytes per multibyte character (plus terminating nul), so the general approach I'm taking is to try to allocate enough space, AND to manually add a NUL at the end of each buffer just in case I screwed up the "enough space" thing. Fixes bug 5909.
* | | changes file and whitespace fix for bug5235 patchNick Mathewson2012-06-08
| | |
* | | Rate-limit 'Weighted bandwidth is 0.000000 ...' message; it can be produced ↵Andrea Shepard2012-06-08
| | | | | | | | | | | | in extreme quantities
* | | Merge remote-tracking branch 'arma/bug3886'Nick Mathewson2012-06-07
|\ \ \ | |/ / |/| | | | | | | | Conflicts: src/or/dirserv.c
| * | let private tor networks more reliably handle hidden servicesRoger Dingledine2011-09-01
| | | | | | | | | | | | this is a tweak on the fix in f87c6f100d (see also #2088)
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2012-06-07
|\ \ \ | |_|/ |/| |
| * | Send a CRLF at the end of a STATUS_* event, not in the middle of itRobert Ransom2012-06-07
| | | | | | | | | | | | Fixes bug 6094; bugfix on commit 3a9351b57e528b1d0bd2e72bcf78db7c91b2ff8f.
* | | Merge branch 'bug5603'Nick 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
| | | |
* | | | 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/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
| | | | |
* | | | | 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.
* | | | | 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-05-31
|\| | | |
| * | | | 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/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
| | | | |
| * | | | Remove spurioius return in one out of four if-else clauses.Linus Nordberg2012-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | We do return right after the if-else. This return (with its confusing comments) comes from before 6b7c3b42 but doesn't make sense now.
| * | | | Change an assertion into a warning in connection_or_handle_event_cb()Nick Mathewson2012-05-24
| | | | | | | | | | | | | | | | | | | | | | | | | Possibly addresses bug 4873, though IMO that's likely not a real bug: it seems likely to have been an ssl version mismatch.
* | | | | Merge remote-tracking branch 'public/bug5541_v2'Nick Mathewson2012-05-31
|\ \ \ \ \
| * | | | | Prevent an (impossible) null-pointer dereference in ↵Nick Mathewson2012-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | connection_edge_process_relay_cell This would happen if the deliver window could become negative because of an nonexistent connection. (Fortunately, _that_ can't occur, thanks to circuit_consider_sending_sendme. Still, if we change our windowing logic at all, we won't want this to become triggerable.) Fix for bug 5541. Bugfix on 4a66865d, back from 0.0.2pre14. asn found this. Nice catch, asn!
* | | | | | Merge remote-tracking branch 'public/bug1938'Nick Mathewson2012-05-31
|\ \ \ \ \ \
| * | | | | | When downloading bridge descs from a bridge authority, always be anonymousNick Mathewson2012-04-27
| | | | | | |
* | | | | | | Merge remote-tracking branch 'public/bug2954_more'Nick Mathewson2012-05-31
|\ \ \ \ \ \ \
| * | | | | | | Abort writing cached-microdescs if a failed write has occurred.Nick Mathewson2012-05-24
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Bug 2954; fix on 0.2.2.6-alpha.
* | | | | | | Merge remote-tracking branch 'public/bug3196'Nick Mathewson2012-05-31
|\ \ \ \ \ \ \