aboutsummaryrefslogtreecommitdiff
path: root/src/or/control.h
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'origin/maint-0.2.2'•••Conflicts: src/common/Makefile.am src/or/control.c Nick Mathewson2011-05-23
|\
| * Merge branch 'feature3049-v2' into maint-0.2.2•••Conflicts: src/common/Makefile.am Nick Mathewson2011-05-23
| |\
| | * Split control connection cleanup out of connection_freeRobert Ransom2011-05-20
| | * Exit immediately if we can't monitor our owning controller process•••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. Robert Ransom2011-05-20
| | * Implement __OwningControllerProcess option•••Implements part of feature 3049. Robert Ransom2011-05-20
* | | Merge remote-tracking branch 'origin/maint-0.2.2'•••Conflicts: src/or/config.c src/or/dirserv.c src/or/or.h Nick Mathewson2011-05-13
|\| |
| * | Write automatically-chosen control ports to a file.Nick Mathewson2011-05-13
| |/
* | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-03
|\|
| * Bump copyright statements to 2011 (0.2.2)Nick Mathewson2011-01-03
* | Add a SIGNAL event for control connections•••Implements ticket #1955 John Brooks2010-11-19
* | Try to make most routerstatus_t interfaces constNick Mathewson2010-10-01
|/
* Create control.hSebastian Hahn2010-07-27