summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-07prepare 0.2.2.10-alpha for releasetor-0.2.2.10-alphaRoger Dingledine
2010-03-06Merge branch 'maint-0.2.1'Roger Dingledine
Conflicts: ChangeLog configure.in contrib/tor-mingw.nsi.in src/win32/orconfig.h
2010-03-06clean up the 0.2.1.25 changelogRoger Dingledine
2010-03-05Clarify that CRLF means "A CR then an LF". Explain what those are.Nick Mathewson
Apparently this is not as obvious as I thought.
2010-03-05commit my annotations while i was hunting down the host order bugRoger Dingledine
2010-03-05Merge branch 'master' of ssh://git@git-rw.torproject.org/torRoger Dingledine
2010-03-04Merge commit 'sebastian/manpage'Nick Mathewson
2010-03-04Merge commit 'origin/maint-0.2.1'Nick Mathewson
Conflicts: src/or/config.c src/or/test.c
2010-03-04Apply Roger's bug 1269 fix.Nick Mathewson
From http://archives.seul.org/tor/relays/Mar-2010/msg00006.html : As I understand it, the bug should show up on relays that don't set Address to an IP address (so they need to resolve their Address line or their hostname to guess their IP address), and their hostname or Address line fails to resolve -- at that point they'll pick a random 4 bytes out of memory and call that their address. At the same time, relays that *do* successfully resolve their address will ignore the result, and only come up with a useful address if their interface address happens to be a public IP address.
2010-03-04Merge remote branch 'mikeperry/bwweight-smartlistfix'Nick Mathewson
2010-03-03Woops, forgot the second warn.Mike Perry
Also, differentiate the two log messages.
2010-03-03Add proposal 170 "Configuration options regarding circuit building"Sebastian Hahn
2010-03-03Merge commit 'mikeperry/bwweight-smartlistfix'Roger Dingledine
2010-03-03Demote warn to info, since it can happen.Mike Perry
I still feel like we should investigate this case. It seems odd.
2010-03-02Note an exception to when we use OutboundBindAddressPeter Palfrader
2010-03-02Backport fix for time-goes-forward test. Fix bug 1267Nick Mathewson
2010-03-01Add configure switch to disable use of asciidocSebastian Hahn
Also break the build if that switch isn't used and asciidoc isn't available.
2010-03-01Simplify asciidoc-helperSebastian Hahn
We don't need sed for our string manipulation, so let's get rid of it. Suggested by weasel.
2010-03-01Ship the asciidoc-helper file in our tarballsSebastian Hahn
Otherwise, the build process breaks when one of the .1.txt gets a new mtime. Suggested by weasel.
2010-02-28Merge branch 'fix_routerparse_bug'Nick Mathewson
2010-02-27Update copyright dates for files not in maint-0.2.1Nick Mathewson
2010-02-27Merge remote branch 'origin/maint-0.2.1'Nick Mathewson
Conflicts: src/common/test.h src/or/test.c
2010-02-27Update Tor Project copyright yearsNick Mathewson
2010-02-27Fix a consensus-extension bug found by outofwordsNick Mathewson
When the bandwidth-weights branch added the "directory-footer" token, and began parsing the directory footer at the first occurrence of "directory-footer", it made it possible to fool the parsing algorithm into accepting unsigned data at the end of a consensus or vote. This patch fixes that bug by treating the footer as starting with the first "directory-footer" or the first "directory-signature", whichever comes first.
2010-02-27fix some wide lines in routerparse.cNick Mathewson
2010-02-27Merge remote branch 'origin/maint-0.2.1'Nick Mathewson
Conflicts: ChangeLog src/or/routerparse.c
2010-02-27Properly handle non-terminated stringsSebastian Hahn
Treat strings returned from signed_descriptor_get_body_impl() as not NUL-terminated. Since the length of the strings is available, this is not a big problem. Discovered by rieo.
2010-02-26Check for empty smartlists and no bandwidth during node selection.Mike Perry
2010-02-26Don't segfault when checking the consensusSebastian Hahn
2010-02-26Don't believe unauthenticated info in a consensus.Nick Mathewson
Don't allow anything but directory-signature tokens in a consensus after the first directory-signature token. Fixes bug in bandwidth-weights branch. Found by "outofwords."
2010-02-26Proper NULL checking in circuit_list_path_impl()Sebastian Hahn
Another dereference-then-NULL-check sequence. No reports of this bug triggered in the wild. Fixes bugreport 1256. Thanks to ekir for discovering and reporting this bug.
2010-02-26Proper NULL checking for hsdesc publicationSebastian Hahn
Fix a dereference-then-NULL-check sequence. This bug wasn't triggered in the wild, but we should fix it anyways in case it ever happens. Also make sure users get a note about this being a bug when they see it in their log. Thanks to ekir for discovering and reporting this bug.
2010-02-26Zero a cipher completely before freeing itSebastian Hahn
We used to only zero the first ptrsize bytes of the cipher. Since cipher is large enough, we didn't zero too many bytes. Discovered and fixed by ekir. Fixes bug 1254.
2010-02-25add .exe files to gitignoreNick Mathewson
2010-02-25For integers, if !(E<G), then we can infer that E>=G.Nick Mathewson
This means that "if (E<G) {abc} else if (E>=G) {def}" can be replaced with "if (E<G) {abc} else {def}" Doing the second test explicitly made my mingw gcc nervous that we might never be initializing casename.
2010-02-25Add the MIN and MAX macros for platforms that lack themNick Mathewson
2010-02-25Fix 64-bit printf issues in consensus-bw-weights5-merge.Nick Mathewson
For my 64-bit Linux system running with GCC 4.4.3-fc12-whatever, you can't do 'printf("%lld", (int64_t)x);' Instead you need to tell the compiler 'printf("%lld", (long long int)x);' or else it doesn't believe the types match. This is why we added U64_PRINTF_ARG; it looks like we needed an I64_PRINTF_ARG too.
2010-02-25Merge remote branch 'mikeperry/consensus-bw-weights5-merge'Nick Mathewson
Conflicts: ChangeLog
2010-02-25Check snprintf return values in format_networkstatus_vote.Mike Perry
Maybe this is what parakeep was complaining about? Really wish he would stick around more. Playing these guessing games is not fun :(
2010-02-25Cast our weights down to ints from int64.Mike Perry
They are capped to be between 0 and weight_scale (10000) by the code just before the snprintf.
2010-02-25Update dir-spec.txt with begin_dir weights.Mike Perry
2010-02-25Merge remote branch 'sebastian/manpage'Nick Mathewson
2010-02-25Merge remote branch 'sebastian/polipo'Nick Mathewson
2010-02-25Restrict PerConnBWRate|Burst to INT32_MAX, update manpageSebastian Hahn
All other bandwidthrate settings are restricted to INT32_MAX, but this check was forgotten for PerConnBWRate and PerConnBWBurst. Also update the manpage to reflect the fact that specifying a bandwidth in terabytes does not make sense, because that value will be too large.
2010-02-24Make unit tests work.Mike Perry
Still not sure why they generate an empty consensus document.. Too much frobbing going on there.
2010-02-23Update a section of the exit notice file, give it a changelog.Sebastian Hahn
2010-02-23Fix some urls in the exit noticeSebastian Hahn
Patch by Christian Kujau to fix some links in the exit notice file (the file you'd use for your DirPortFrontPage), as well as making the file xhtml compatible. Thanks!
2010-02-23Update polipo build instructions for OS X 10.6Sebastian Hahn
2010-02-23Proper NULL checking for hsdesc publicationSebastian Hahn
Fix a dereference-then-NULL-check sequence. This bug wasn't triggered in the wild, but we should fix it anyways in case it ever happens. Also make sure users get a note about this being a bug when they see it in their log. Thanks to ekir for discovering and reporting this bug.
2010-02-23Fix another coverity-spotted memleakSebastian Hahn
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion