aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-12-22and forward-port those lines tooRoger Dingledine
2013-12-22Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-12-22Merge branch 'bug10465' into maint-0.2.4Nick Mathewson
2013-12-22Fix automapping to ipv6Nick Mathewson
Bugfix on 0.2.4.7-alpha; fixes bug 10465.
2013-12-22forward-port recent changelogs and release notesRoger Dingledine
2013-12-21Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-12-21Merge branch 'bug10456' into maint-0.2.4Nick Mathewson
2013-12-21Fix a logic error in circuit_stream_is_being_handled.Nick Mathewson
When I introduced the unusable_for_new_circuits flag in 62fb209d837f3f551, I had a spurious ! in the circuit_stream_is_being_handled loop. This made us decide that non-unusable circuits (that is, usable ones) were the ones to avoid, and caused it to launch a bunch of extra circuits. Fixes bug 10456; bugfix on 0.2.4.12-alpha.
2013-12-20Merge remote-tracking branch 'linus/bug10324'Nick Mathewson
2013-12-18Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
Conflicts: src/common/crypto.c
2013-12-18Merge branch 'bug10402_redux_024' into maint-0.2.4Nick Mathewson
2013-12-18Never allow OpenSSL engines to replace the RAND_SSLeay methodNick Mathewson
This fixes bug 10402, where the rdrand engine would use the rdrand instruction, not as an additional entropy source, but as a replacement for the entire userspace PRNG. That's obviously stupid: even if you don't think that RDRAND is a likely security risk, the right response to an alleged new alleged entropy source is never to throw away all previously used entropy sources. Thanks to coderman and rl1987 for diagnosing and tracking this down.
2013-12-17Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
2013-12-17Merge branch 'bug10423' into maint-0.2.4Nick Mathewson
2013-12-17Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson
Conflicts: src/or/microdesc.c Conflict because one change was on line adjacent to line where 01206893 got fixed.
2013-12-17Merge remote-tracking branch 'public/bug10409_023' into maint-0.2.4Nick Mathewson
2013-12-17Avoid double-free on failure to dump_descriptor() a cached mdNick Mathewson
This is a fix for 10423, which was introducd in caa0d15c in 0.2.4.13-alpha. Spotted by bobnomnom.
2013-12-16Avoid free()ing from an mmap on corrupted microdesc cacheNick Mathewson
The 'body' field of a microdesc_t holds a strdup()'d value if the microdesc's saved_location field is SAVED_IN_JOURNAL or SAVED_NOWHERE, and holds a pointer to the middle of an mmap if the microdesc is SAVED_IN_CACHE. But we weren't setting that field until a while after we parsed the microdescriptor, which left an interval where microdesc_free() would try to free() the middle of the mmap(). This patch also includes a regression test. This is a fix for #10409; bugfix on 0.2.2.6-alpha.
2013-12-12Make tor-gencert create 2048 bit signing keys.Linus Nordberg
2013-12-09Fix get_configured_bridge_by_addr_port_digest(.,.,NULL)rl1987
The old behavior was that NULL matched only bridges without known identities; the correct behavior is that NULL should match all bridges (assuming that their addr:port matches).
2013-12-09Merge remote-tracking branch 'public/bug10131_024'Nick Mathewson
2013-12-09Remove a check in channeltls.c that could never fail.Nick Mathewson
We were checking whether a 8-bit length field had overflowed a 503-byte buffer. Unless somebody has found a way to store "504" in a single byte, it seems unlikely. Fix for 10313 and 9980. Based on a pach by Jared L Wong. First found by David Fifield with STACK.
2013-12-05Set CREATE_NO_WINDOW in tor_spawn_background.David Fifield
This flag prevents the creation of a console window popup on Windows. We need it for pluggable transport executables--otherwise you get blank console windows when you launch the 3.x browser bundle with transports enabled. http://msdn.microsoft.com/en-us/library/ms684863.aspx#CREATE_NO_WINDOW The browser bundles that used Vidalia used to set this flag when launching tor itself; it was apparently inherited by the pluggable transports launched by tor. In the 3.x bundles, tor is launched by some JavaScript code, which doesn't have the ability to set CREATE_NO_WINDOW. tor itself is now being compiled with the -mwindows option, so that it is a GUI application, not a console application, and doesn't show a console window in any case. This workaround doesn't work for pluggable transports, because they need to be able to write control messages to stdout. https://trac.torproject.org/projects/tor/ticket/9444#comment:30
2013-11-25Merge branch 'bug4677'Nick Mathewson
2013-11-25Restore prop198 behavior from 4677 patchNick Mathewson
The previous commit from piet would have backed out some of proposal 198 and made servers built without the V2 handshake not use the unrestricted cipher list from prop198. Bug not in any released Tor.
2013-11-25Restore ability to build with V2_HANDSHAKE_SERVERNick Mathewson
Fixes bug 4677; bugfix on 0.2.3.2-alpha. Fix by "piet".
2013-11-22Avoid warning about impossible check for flags & 0Nick Mathewson
Fixes CID 743381
2013-11-22Only update view of micrdescriptor pos if pos is fetchable.Nick Mathewson
It's conceivable (but probably impossible given our code) that lseek could return -1 on an error; when that happens, we don't want off to become -1. Fixes CID 1035124.
2013-11-22Add checks to prevent memcmp(.,.,negative) in tests (CID 1064417)Nick Mathewson
2013-11-22Fix another unit test memory leak. CID1087949,CID1087950.Nick Mathewson
2013-11-22Fix a bunch of coverity-spotted unit test resource leaksNick Mathewson
CIDs: 1130994, 1130993, 1130992, 1130991
2013-11-22Remove needless fd var from test. CID 1130989.Nick Mathewson
2013-11-22Handle unlikely negative time in tor_log_err_sigsafeNick Mathewson
Coverity wants this; CID 1130990.
2013-11-20Whitespace cleanupNick Mathewson
2013-11-20Merge remote-tracking branch 'sysrqb/bug9859_5'Nick Mathewson
2013-11-18Fix crypto/digests testNick Mathewson
2013-11-18Merge branch 'finish_prop157'Nick Mathewson
2013-11-18Tweak #10162 documentation a bitNick Mathewson
2013-11-18Add a _GNU_SOURCE definition to backtrace.c to fix compilationNick Mathewson
2013-11-18Whoops; changes files belong in changes.Nick Mathewson
2013-11-18Whoops -- add missing defined().Nick Mathewson
2013-11-18Make header includes match declarations in pc_from_ucontext.m4Nick Mathewson
With any luck, this will clean up errors where we detect that REG_{EIP,RIP} is present in autoconf, but when we go to include it, it isn't there.
2013-11-18Fix compilation under openssl 0.9.8Nick Mathewson
It's not nice to talk about NID_aes_{128,256}_{ctr,gcm} when they don't exist. Fix on 84458b79a78ea7e26820bf0; bug not in any released Tor.
2013-11-18Remove 'struct timeval now' that was shadowing 'struct timeval now'.Nick Mathewson
This was a mistake in the merge commit 7a2b30fe16eacc040b3dd11. It would have made the CellStatistics code give completely bogus results. Bug not in any released Tor.
2013-11-18Fix whitespaceNick Mathewson
2013-11-18Log more OpenSSL engine statuses at startup.Nick Mathewson
Fixes ticket 10043; patch from Joshua Datko.
2013-11-18Merge branch 'backtrace_squashed_merged'Nick Mathewson
2013-11-18Merge branch 'backtrace_squashed'Nick Mathewson
Conflicts: src/common/sandbox.c src/common/sandbox.h src/common/util.c src/or/main.c src/test/include.am src/test/test.c
2013-11-18Improve backtrace changes fileNick Mathewson
2013-11-18Refactor format_*_number_sigsafe to have a common implementationNick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion