summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-16Merge branch '024_msvc_squashed'Nick Mathewson
Conflicts: src/or/or.h srcwin32/orconfig.h
2013-01-16Fix an instance of snprintf; don't use _snprintf directlyNick Mathewson
2013-01-16Changes files for 024_msvc branchNick Mathewson
2013-01-16When building with MSVC, call every enum bitfield unsignedNick Mathewson
Fixes bug 7305.
2013-01-16Add HAVE_EVENT_BASE_LOOPEXIT to win32/orconfig.hNick Mathewson
Fix for bug 7308
2013-01-16Add more test modules for nmake makefilesNick Mathewson
2013-01-16Try to build tinytest.obj from the right sourcesNick Mathewson
2013-01-16use the /Fe flag with msvcNick Mathewson
Fixes 7309
2013-01-16Add missing targets to src/test/Makefile.nmake. Fix for 7316Nick Mathewson
2013-01-16Add HAVE_EVENT2_DNS_H to MSVC orconfig.hNick Mathewson
Fix for bug 7313
2013-01-16Fix a const warning under msvcNick Mathewson
2013-01-16Add clean target and test subdir to makefile.nmakeNick Mathewson
2013-01-16Add missing objects to Makefile.nmakeNick Mathewson
2013-01-16Add missing includes and libs to makefile.nmakeNick Mathewson
Fixes bugs 7312 and 7310.
2013-01-16Define SIZEOF_INTPTR_T when defining replacement intptr_tNick Mathewson
Fixes bug 7669
2013-01-16Merge branch 'bug5285_v2'Nick Mathewson
2013-01-16Aftermath of isin->contains renamingNick Mathewson
Fix wide lines and comments, and add a changes file
2013-01-16Rename *_isin to *_containsNick Mathewson
This is an automatically generated commit, from the following perl script, run with the options "-w -i -p". s/smartlist_string_num_isin/smartlist_contains_int_as_string/g; s/smartlist_string_isin((?:_case)?)/smartlist_contains_string$1/g; s/smartlist_digest_isin/smartlist_contains_digest/g; s/smartlist_isin/smartlist_contains/g; s/digestset_isin/digestset_contains/g;
2013-01-16Remove two extrneous semicolons in dirserv.cNick Mathewson
In 6fbdf635 we added a couple of statements like: if (test) { ... }; The extraneous semicolons there get flagged as worrisome empty statements by the cparser library, so let's fix them. Patch by Christian Grothoff; fixes bug 7115.
2013-01-16Definx HAVE_EVENT_BASE_LOOPEXITin msvc orconfig.hNick Mathewson
Fixes bug 7308; bugfix on no released Tor, since we haven't actually built right on MSVC in ages.
2013-01-16Merge branch 'bug7972'Nick Mathewson
2013-01-16Actually link against nacl when we want to use itNick Mathewson
Fixes more of bug 7972
2013-01-16changes file for 7896Nick Mathewson
2013-01-16Merge remote-tracking branch 'asn/bug7896'Nick Mathewson
2013-01-16Check for nacl headers in nacl/ subdirNick Mathewson
Fix for bug 7972
2013-01-16Add a new automake dropping ("test-driver") to .gitignoreNick Mathewson
2013-01-16Update the copyright date to 201.Nick Mathewson
2013-01-15Forward-port fix for 7889Nick Mathewson
2013-01-15Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson
2013-01-15Merge branch 'bug7889_023' into maint-0.2.3Nick Mathewson
2013-01-15Merge branch 'small_typo_fixes'Nick Mathewson
2013-01-15Bump to 0.2.4.9-alpha-devNick Mathewson
2013-01-15Clean up odds and endsRoger Dingledine
2013-01-15bump to 0.2.4.9-alphator-0.2.4.9-alphaRoger Dingledine
2013-01-15fold in new change stanzaRoger Dingledine
2013-01-15Fix handling of ntor handshakes received via CREATE cellsNick Mathewson
Fixes bug 7959; bugfix on 0.2.4.8-alpha.
2013-01-15Better log message to diagnose #7959Nick Mathewson
2013-01-15Bump version to 0.2.4.8-alpha-devNick Mathewson
2013-01-14bump to 0.2.4.8-alphator-0.2.4.8-alphaRoger Dingledine
2013-01-14finish poking at the changelogRoger Dingledine
2013-01-14Revert junk accidentally included with "start folding in the changes entries"Nick Mathewson
Looks like Roger's debugging code wanted to take a tour of the world outside his sandbox. This reverts part of commit 19d37202362c0298ae2f3954b0065ccfcef0dbda.
2013-01-14Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson
2013-01-14Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson
2013-01-14Reject create/begin/etc cells with {circ,stream}ID 0.Nick Mathewson
Otherwise, it's possible to create streams or circuits with these bogus IDs, leading to orphaned circuits or streams, or to ones that can cause bandwidth DOS problems. Fixes bug 7889; bugfix on all released Tors.
2013-01-14start folding in the changes entriesRoger Dingledine
2013-01-14Merge branch 'bug7869'Nick Mathewson
2013-01-13Merge remote-tracking branch 'mikeperry/bug7691-rebased'Nick Mathewson
2013-01-13Merge branch 'bug7935'Nick Mathewson
2013-01-11Handle EWOULDBLOCK as EAGAIN if they happen to be different.Nick Mathewson
Fixes bug 7935. Reported by 'oftc_must_be_destroyed'.
2013-01-09Mention name of the transport used when we learn the fpr of a bridge.George Kadianakis