summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2012-06-12fold in changes files so farRoger Dingledine
2012-06-11Merge branch 'bug5452'Nick Mathewson
2012-06-11Call bug5452 fix a feature; note its trac number in the changes fileNick Mathewson
2012-06-11Add change file for 5452Andrea Shepard
2012-06-11Make RECOMMENDED_MIN_CIRCUIT_BUILD_TIMEOUT warning tell the user how to fix it.Andrea Shepard
2012-06-11Remove a couple of debugging "echo"s that snuck into configure.inNick Mathewson
2012-06-11Merge remote-tracking branch 'public/bug4592'Nick Mathewson
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-11Merge branch 'bug2865'Nick Mathewson
2012-06-11List defaults consistently in manpageNick Mathewson
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.
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-07typo noticed by "_raptor"Roger Dingledine
2012-06-07Correct the defaults for the *Statistics optionsNick Mathewson
2012-06-07Merge remote-tracking branch 'arma/bug3886'Nick Mathewson
Conflicts: src/or/dirserv.c
2012-06-07Fix mingw build with -DUNICODE -D_UNICODENick Mathewson
This is a very blunt fix, and mostly just turns some func() calls into FuncA() to make things build again. Fixes bug 6097.
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-07apply 6abb638954b to 0.2.3.16-alpha tooRoger Dingledine
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-06use my time machine to fix a few more typosRoger Dingledine
2012-06-05bump to 0.2.3.16-alpha-devRoger Dingledine
2012-06-05use my time machine to fix the changelogRoger Dingledine
2012-06-05add a blurb for 0.2.3.16-alphator-0.2.3.16-alphaRoger Dingledine
2012-06-05today is the day for 0.2.3.16-alphaRoger Dingledine
2012-06-05start folding in the changes filesRoger Dingledine
2012-06-05Merge branch 'bug5603'Nick Mathewson
2012-06-05Changes file for bug 5603Nick 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-05Merge remote-tracking branch 'public/getfilesize_64'Nick Mathewson
Conflicts: src/common/compat.c The getfilesize change conflicted with the removal of file_handle from the windows tor_mmap_t.
2012-06-05Fix some mingw build warningsNick Mathewson
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.
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/bug3894'Nick Mathewson
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-04Missing copyright/license statement for procmon.cNick 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-04Update the "redox" doxygen/DOCDOC postprocessing scriptNick Mathewson
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.
2012-06-04Resolve some markup complaints from doxygenNick Mathewson
2012-06-04Resolve all currently pending DOCDOC items in masterNick 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.
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion