aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
|\ \
| * | Fix mingw build with -DUNICODE -D_UNICODENick Mathewson2012-06-07
| | | | | | | | | | | | | | | This is a very blunt fix, and mostly just turns some func() calls into FuncA() to make things build again. Fixes bug 6097.
| * | 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.
* | | Merge branch 'bug2865'Nick Mathewson2012-06-11
|\ \ \
| * | | List defaults consistently in manpageNick Mathewson2012-06-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Nearly everywhere, we end options with "(Default: foo)". But in a few places, we inserted an extra period after or before the close parenthesis, and in a few other places we said "(Defaults to foo)". Let's not do that.
| * | | Correct the defaults for the *Statistics optionsNick Mathewson2012-06-07
| | | |
* | | | 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
* | | | typo noticed by "_raptor"Roger Dingledine2012-06-07
|/ / /
* | | 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.
* | | | apply 6abb638954b to 0.2.3.16-alpha tooRoger Dingledine2012-06-07
| |_|/ |/| |
* | | 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
| |\ \ \ \
generated by cgit v1.2.3 (git 2.45.0) at 2024-11-26 00:38:13 +0000