aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-30
|\
| * Merge branch 'bug3228_squashed' into maint-0.2.2Nick Mathewson2011-05-30
| |\
| | * Reinit keys at the start of options_act().Nick Mathewson2011-05-30
| |/ | | | | | | | | | | | | | | | | Previously we did this nearer to the end (in the old_options && transition_affects_workers() block). But other stuff cares about keys being consistent with options... particularly anything which tries to access a key, which can die in assert_identity_keys_ok(). Fixes bug 3228; bugfix on 0.2.2.18-alpha.
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-30
|\| | | | | | | | | Conflicts: src/or/circuituse.c
| * Merge branch 'bug1297a' into maint-0.2.2Nick Mathewson2011-05-30
| |\
| | * Use the normal four-hop CBT for client intro circuitsRobert Ransom2011-05-30
| | | | | | | | | | | | Fixes another part of bug 1297.
| | * Set timestamp_dirty on HS circuits as circuit_expire_building requiresRobert Ransom2011-05-30
| | | | | | | | | | | | | | | | | | Fixes part of #1297; bugfix on 48e0228f1e031a709c1deb149c7dfd187c3609cf, when circuit_expire_building was changed to assume that timestamp_dirty was set when a circuit changed purpose to _C_REND_READY. (It wasn't.)
* | | Merge branch 'maint-0.2.2'Roger Dingledine2011-05-29
|\| |
| * | answer an XXX nickm asked in aa950e6c4Roger Dingledine2011-05-29
| |/
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-28
|\|
| * Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-05-28
| |\
| | * Fix typo in changes/bug2574. Thanks, rransomNick Mathewson2011-05-28
| | |
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-28
|\| | | | | | | | | | | | | | Conflicts: src/or/eventdns.c
| * | Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-05-28
| |\|
| | * Merge branch 'bug2574' into maint-0.2.1Nick Mathewson2011-05-28
| | |\
| | | * Work correctly if your nameserver is ::1Nick Mathewson2011-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We had all the code in place to handle this right... except that we were unconditionally opening a PF_INET socket instead of looking at sa_family. Ow. Fixes bug 2574; not a bugfix on any particular version, since this never worked before.
* | | | Fix a -Wunused-but-set-variable instance in masterNick Mathewson2011-05-28
| | | |
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-28
|\| | |
| * | | Fix GCC 4.6's new -Wunused-but-set-variable warnings.Nick Mathewson2011-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most instances were dead code; for those, I removed the assignments. Some were pieces of info we don't currently plan to use, but which we might in the future. For those, I added an explicit cast-to-void to indicate that we know that the thing's unused. Finally, one was a case where we were testing the wrong variable in a unit test. That one I fixed. This resolves bug 3208.
| * | | Remove the -F option from tor-resolve.Nick Mathewson2011-05-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to mean "Force": it would tell tor-resolve to ask tor to resolve an address even if it ended with .onion. But when AutomapHostsOnResolve was added, automatically refusing to resolve .onion hosts stopped making sense. So in 0.2.1.16-rc (commit 298dc95dfd8), we made tor-resolve happy to resolve anything. The -F option stayed in, though, even though it didn't do anything. Oddly, it never got documented. Found while fixing GCC 4.6 "set, unused variable" warnings.
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-23
|\| | |
| * | | Unbreak the build on libevent 1.x systemsRobert Ransom2011-05-22
| | | |
* | | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-23
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/Makefile.am src/or/control.c
| * | | Merge branch 'feature3049-v2' into maint-0.2.2Nick Mathewson2011-05-23
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/Makefile.am
| | * | | The first argument for a libevent callback should be evutil_socket_tNick Mathewson2011-05-23
| | | | |
| | * | | Appease make check-spaces wrt procmon.hNick Mathewson2011-05-23
| | | | |
| | * | | Split out owning-controller-loss shutdown code into a functionRobert Ransom2011-05-20
| | | | |
| | * | | Add changes file for #3049Robert Ransom2011-05-20
| | | | |
| | * | | Implement TAKEOWNERSHIP commandRobert Ransom2011-05-20
| | | | |
| | * | | Split control connection cleanup out of connection_freeRobert Ransom2011-05-20
| | | | |
| | * | | Fix comment typoRobert Ransom2011-05-20
| | | | |
| | * | | Add an XXXRobert Ransom2011-05-20
| | | | |
| | * | | Fix trailing asterisk in the output of "GETINFO info/names"Robert Ransom2011-05-20
| | | | |
| | * | | Exit immediately if we can't monitor our owning controller processRobert Ransom2011-05-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tor_process_monitor_new can't currently return NULL, but if it ever can, we want that to be an explicitly fatal error, without relying on the fact that monitor_owning_controller_process's chain of caller will exit if it fails.
| | * | | Fix some commentsRobert Ransom2011-05-20
| | | | |
| | * | | Implement __OwningControllerProcess optionRobert Ransom2011-05-20
| | | | | | | | | | | | | | | | | | | | Implements part of feature 3049.
| | * | | Improve a documentation commentRobert Ransom2011-05-12
| | | | |
| | * | | Fix comment typoRobert Ransom2011-05-12
| | | | |
| | * | | Fix comment typoRobert Ransom2011-05-10
| | | | |
| * | | | naked constants are uglyRoger Dingledine2011-05-21
| | | | |
| * | | | finish a comment nickm started in 8ebceeb3Roger Dingledine2011-05-21
| | | | |
* | | | | Merge branch 'maint-0.2.2'Roger Dingledine2011-05-21
|\| | | |
| * | | | remove some (confusing) dead codeRoger Dingledine2011-05-21
| | | | |
| * | | | Merge branch 'bug1810' into maint-0.2.2Roger Dingledine2011-05-21
| |\ \ \ \
| | * | | | Don't recreate descriptor on sighupSebastian Hahn2011-05-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to regenerate our descriptor whenever we'd get a sighup. This was caused by a bug in options_transition_affects_workers() that would return true even if the options were exactly the same. Down the call path we'd call init_keys(), which made us make a new descriptor which the authorities would reject, and the node would subsequently fall out of the consensus. This patch fixes only the first part of this bug: options_transition_affects_workers() behaves correctly now. The second part still wants a fix.
| * | | | | what's up with this trailing whitespaceRoger Dingledine2011-05-20
| |/ / / /
* | | | | Merge branch 'maint-0.2.2'Roger Dingledine2011-05-20
|\| | | |
| * | | | log the reason for publishing a new relay descriptorRoger Dingledine2011-05-19
| | | | | | | | | | | | | | | | | | | | now we have a better chance of hunting down the root cause of bug 1810.
| * | | | Fix a compile warning on OSX 10.6Sebastian Hahn2011-05-20
| | | | |
* | | | | add 0.2.2.27-beta changelog to masterRoger Dingledine2011-05-19
| | | | | | | | | | | | | | | | | | | | also clean up the 0.2.3.1-alpha changelog headers
generated by cgit v1.2.3 (git 2.45.0) at 2024-11-15 15:54:23 +0000