aboutsummaryrefslogtreecommitdiff
path: root/src/or
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2014-02-06
|\ | | | | | | | | | | | | Conflicts: changes/bug10485 src/or/rephist.c src/or/status.c
| * Add a missing includeNick Mathewson2014-02-06
| |
| * Deliver circuit handshake counts as part of the heartbeatNick Mathewson2014-02-06
| | | | | | | | | | | | Previously, they went out once an hour, unconditionally. Fixes 10485; bugfix on 0.2.4.17-rc.
* | TransProxyType replaces TransTPROXY optionNick Mathewson2014-02-03
| | | | | | | | | | | | | | I'm making this change now since ipfw will want its own option too, and proliferating options here isn't sensible. (See #10582 and #10267)
* | More fixes to rip out all of the v2 directory code.Karsten Loesing2014-02-03
| | | | | | | | (This was a squash commit, but I forgot to squash it. Sorry! --Nick)
* | 10365: Close connections if the VERSIONS cell has an odd length.rl19872014-02-03
| | | | | | | | Fixes issue 10365.
* | Defensive programming in control_event_hs_descriptor_*Nick Mathewson2014-02-03
| | | | | | | | | | It looks to me like these functions can never get called with NULL arguments, but better safe than sorry.
* | Merge remote-tracking branch 'houqp/hs_control'Nick Mathewson2014-02-03
|\ \
| * | add hidden service descriptor async control eventQingping Hou2014-01-29
| | |
* | | Merge remote-tracking branch 'public/bug10758'Nick Mathewson2014-02-03
|\ \ \
| * | | Rip out all of the v2 directory code.Nick Mathewson2014-01-29
| |/ / | | | | | | | | | | | | | | | The remaining vestige is that we continue to publish the V2dir flag, and that, for the controller, we continue to emit v2 directory formats when requested.
* | | Move the friendly warning about TPROXY and root to EPERM timeNick Mathewson2014-02-02
| | | | | | | | | | | | | | | | | | | | | | | | I'm doing this because: * User doesn't mean you're running as root, and running as root doesn't mean you've set User. * It's possible that the user has done some other capability-based hack to retain the necessary privileges.
* | | Add support for TPROXY via new TransTPRoxy optionNick Mathewson2014-01-31
|/ / | | | | | | Based on patch from "thomo" at #10582.
* | whitespace fixesNick Mathewson2014-01-17
| |
* | Add explicit check for 0-length extend2 cellsNick Mathewson2014-01-03
| | | | | | | | | | | | This is harmless in the Tor of today, but important for correctness. Fixes bug 10536; bugfix on 0.2.4.8-alpha. Reported by "cypherpunks".
* | Merge remote-tracking branch 'public/bug10485'Nick Mathewson2013-12-24
|\ \
| * | Move onion-type stats message into heartbeatNick Mathewson2013-12-24
| |/ | | | | | | Fix for 10485. Fix on 0.2.4.17-alpha.
* | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-12-22
|\|
| * Fix automapping to ipv6Nick Mathewson2013-12-22
| | | | | | | | Bugfix on 0.2.4.7-alpha; fixes bug 10465.
* | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-12-21
|\|
| * Fix a logic error in circuit_stream_is_being_handled.Nick Mathewson2013-12-21
| | | | | | | | | | | | | | | | | | | | 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.
* | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-12-17
|\|
| * Merge branch 'bug10423' into maint-0.2.4Nick Mathewson2013-12-17
| |\
| | * Avoid double-free on failure to dump_descriptor() a cached mdNick Mathewson2013-12-17
| | | | | | | | | | | | | | | | | | This is a fix for 10423, which was introducd in caa0d15c in 0.2.4.13-alpha. Spotted by bobnomnom.
* | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-12-17
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/microdesc.c Conflict because one change was on line adjacent to line where 01206893 got fixed.
| * | Merge remote-tracking branch 'public/bug10409_023' into maint-0.2.4Nick Mathewson2013-12-17
| |\ \ | | |/ | |/|
| | * Avoid free()ing from an mmap on corrupted microdesc cacheNick Mathewson2013-12-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Fix get_configured_bridge_by_addr_port_digest(.,.,NULL)rl19872013-12-09
| | | | | | | | | | | | | | | | | | 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).
* | | Merge remote-tracking branch 'public/bug10131_024'Nick Mathewson2013-12-09
|\ \ \
| * | | Remove a check in channeltls.c that could never fail.Nick Mathewson2013-12-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Only update view of micrdescriptor pos if pos is fetchable.Nick Mathewson2013-11-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge remote-tracking branch 'sysrqb/bug9859_5'Nick Mathewson2013-11-20
|\ \ \ \
| * | | | A Bridge Authority should compute flag thresholdsMatthew Finkel2013-10-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a bridge authority, before we create our networkstatus document, we should compute the thresholds needed for the various status flags assigned to each bridge based on the status of all other bridges. We then add these thresholds to the networkstatus document for easy access. Fixes for #1117 and #9859.
* | | | | Merge branch 'finish_prop157'Nick Mathewson2013-11-18
|\ \ \ \ \
| * | | | | Tweak #10162 documentation a bitNick Mathewson2013-11-18
| | | | | |
| * | | | | Make the dir-key-crosscert element requiredNick Mathewson2013-11-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In proposal 157, we added a cross-certification element for directory authority certificates. We implemented it in 0.2.1.9-alpha. All Tor directory authorities now generate it. Here, as planned, make it required, so that we can finally close proposal 157. The biggest change in the code is in the unit test data, where some old hardcoded certs that we made long ago have become no longer valid and now need to be replaced.
* | | | | | Remove 'struct timeval now' that was shadowing 'struct timeval now'.Nick Mathewson2013-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge branch 'backtrace_squashed'Nick Mathewson2013-11-18
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Unit tests for new functions in log.cNick Mathewson2013-11-18
| | | | | | |
| * | | | | | Add a sighandler-safe logging mechanismNick Mathewson2013-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had accidentially grown two fake ones: one for backtrace.c, and one for sandbox.c. Let's do this properly instead. Now, when we configure logs, we keep track of fds that should get told about bad stuff happening from signal handlers. There's another entry point for these that avoids using non-signal-handler-safe functions.
| * | | | | | Basic backtrace abilityNick Mathewson2013-11-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On platforms with the backtrace/backtrace_symbols_fd interface, Tor can now dump stack traces on assertion failure. By default, I log them to DataDir/stack_dump and to stderr.
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-11-15
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/relay.c Conflict changes were easy; compilation fixes required were using using TOR_SIMPLEQ_FIRST to get head of cell queue.
| * | | | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-11-15
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/or.h src/or/relay.c Conflicts were simple to resolve. More fixes were needed for compilation, including: reinstating the tv_to_msec function, and renaming *_conn_cells to *_chan_cells.
| | * | | | Improved circuit queue out-of-memory handlerNick Mathewson2013-11-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, when we ran low on memory, we'd close whichever circuits had the most queued cells. Now, we close those that have the *oldest* queued cells, on the theory that those are most responsible for us running low on memory, and that those are the least likely to actually drain on their own if we wait a little longer. Based on analysis from a forthcoming paper by Jansen, Tschorsch, Johnson, and Scheuermann. Fixes bug 9093.
* | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-11-10
|\| | | | |
| * | | | | Fix two more DirServer mentions in logNick Mathewson2013-11-10
| | | | | |
| * | | | | Fix a wide lineNick Mathewson2013-11-10
| | | | | |
| * | | | | Change documentation DirServer->DirAuthorityNick Mathewson2013-11-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We renamed the option, but we didn't actually fix it in the log messages or the docs. This patch does that. For #10124. Patch by sqrt2.
* | | | | | Implementing --allow-missing-torrc CLI option.rl19872013-11-07
| | | | | |
* | | | | | Merge branch 'prop221_squashed_024'Nick Mathewson2013-11-01
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/or.h