aboutsummaryrefslogtreecommitdiff
Commit message (Expand)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
| |/
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-30
|\|
| * Merge branch 'bug1297a' into maint-0.2.2Nick Mathewson2011-05-30
| |\
| | * Use the normal four-hop CBT for client intro circuitsRobert Ransom2011-05-30
| | * Set timestamp_dirty on HS circuits as circuit_expire_building requiresRobert Ransom2011-05-30
* | | 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
|\| |
| * | 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
* | | | 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
| * | | Remove the -F option from tor-resolve.Nick Mathewson2011-05-23
* | | | 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
|\| | |
| * | | Merge branch 'feature3049-v2' into maint-0.2.2Nick Mathewson2011-05-23
| |\ \ \
| | * | | 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
| | * | | Fix some commentsRobert Ransom2011-05-20
| | * | | Implement __OwningControllerProcess optionRobert Ransom2011-05-20
| | * | | 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
| * | | | | 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
| * | | | Fix a compile warning on OSX 10.6Sebastian Hahn2011-05-20
* | | | | add 0.2.2.27-beta changelog to masterRoger Dingledine2011-05-19