aboutsummaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2012-06-13Merge remote-tracking branch 'public/bug3940_redux'Nick Mathewson
2012-06-13Fix integer overflow in cell stats spotted by atagar.Karsten Loesing
Fixes #5849.
2012-06-11fixup! An attempt at bug3940 and making AllowDotExit 0 work with MapAddressNick Mathewson
2012-06-11Document ADDRMAPSRC_NONE.Nick Mathewson
2012-06-11Merge branch 'bug5452'Nick Mathewson
2012-06-11Make RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT warning tell the user how to fix it.Andrea Shepard
2012-06-11Merge remote-tracking branch 'public/bug5598'Nick Mathewson
Conflicts: doc/tor.1.txt Conflict was on a formatting issue in the manpage.
2012-06-11Merge branch 'bug6097'Nick Mathewson
2012-06-08Warn if the user has set CircuitBuildTimeout stupidly low and turned off ↵Andrea Shepard
LearnCircuitBuildTimeout
2012-06-08changes file and whitespace fix for bug5235 patchNick Mathewson
2012-06-08Rate-limit 'Weighted bandwidth is 0.000000 ...' message; it can be produced ↵Andrea Shepard
in extreme quantities
2012-06-07Merge remote-tracking branch 'arma/bug3886'Nick Mathewson
Conflicts: src/or/dirserv.c
2012-06-07Be more careful calling wcstombsNick Mathewson
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.
2012-06-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2012-06-07Send a CRLF at the end of a STATUS_* event, not in the middle of itRobert Ransom
Fixes bug 6094; bugfix on commit 3a9351b57e528b1d0bd2e72bcf78db7c91b2ff8f.
2012-06-06Change the default for DynamicDHGroups to 0Nick Mathewson
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.
2012-06-05Merge branch 'bug5603'Nick Mathewson
2012-06-05Minor changes to bug5603Nick Mathewson
* Minor stylistic changes to comments and doxygen * Use strcmp_opt; it already exists. * Tighten bridge_has_digest implementation a little.
2012-06-05Revert "Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridges"Nick Mathewson
This reverts commit 981e896dd2eaf69798bb503c271306ee779dd6d2. Apparently Karsten still needs DirReqStatistics for bridges; see
2012-06-05Downgrade tor_assert(0) to tor_fragile_assert() in windows stub ↵Nick Mathewson
create_unix_sockaddr
2012-06-05Merge remote-tracking branch 'public/format_doubles'Nick Mathewson
Conflicts: src/or/geoip.c
2012-06-05Disable (Cell,DirReq,Entry,ExitPort)Statistics on bridgesNick Mathewson
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.
2012-06-05Merge remote-tracking branch 'public/bug4657'Nick Mathewson
Conflicts: src/or/router.c
2012-06-05Merge remote-tracking branch 'public/bug4710'Nick Mathewson
2012-06-05Fix "make check-spaces" issuesNick Mathewson
2012-06-05Resolve about 24 DOCDOCsNick Mathewson
2012-06-04Update copyright dates to 2012; add a few missing copyright statementsNick Mathewson
2012-06-04Add about 60 more DOCDOC comments to 0.2.3Nick Mathewson
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.
2012-06-04Resolve some markup complaints from doxygenNick Mathewson
2012-06-04Resolve all currently pending DOCDOC items in masterNick Mathewson
2012-06-04Document the new exit_source_out argument to addressmap_rewriteNick Mathewson
2012-06-04Merge origin/maint-0.2.2 for 6007_strictNick Mathewson
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.
2012-06-04Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2Nick Mathewson
2012-06-04Kill non-open OR connections with any data on their inbufs.Nick Mathewson
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.
2012-06-03Improve conflict resolution when adding new bridges.George Kadianakis
2012-05-31Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2012-05-31Make all begindir or one-hop circuits internalNick Mathewson
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.
2012-05-31Merge remote-tracking branch 'public/bug5374'Nick Mathewson
2012-05-31Merge remote-tracking branch 'linus/bug4873_ln'Nick Mathewson
2012-05-31Merge remote-tracking branch 'public/bug5541_v2'Nick Mathewson
2012-05-31Merge remote-tracking branch 'public/bug1938'Nick Mathewson
2012-05-31Merge remote-tracking branch 'public/bug2954_more'Nick Mathewson
2012-05-31Remove unexpected "unexpectedly".Linus Nordberg
2012-05-31Remove spurioius return in one out of four if-else clauses.Linus Nordberg
We do return right after the if-else. This return (with its confusing comments) comes from before 6b7c3b42 but doesn't make sense now.
2012-05-31Merge remote-tracking branch 'public/bug3196'Nick Mathewson
2012-05-31Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
(For bug 5969 fix)
2012-05-30Fix more clang format-nonliteral warnings (bug 5969)Nick Mathewson
2012-05-30Merge branch 'bug5604'Nick Mathewson
2012-05-30Add a little documentation for the bug5604 fixNick Mathewson
2012-05-30Merge remote-tracking branch 'public/bug5954'Nick Mathewson