diff options
author | George Kadianakis <desnacked@riseup.net> | 2019-04-05 14:51:21 +0300 |
---|---|---|
committer | George Kadianakis <desnacked@riseup.net> | 2019-04-05 14:51:21 +0300 |
commit | 747b74c1825de055bd027c9c74088efdd61d7481 (patch) | |
tree | 2b38483f2da46e5772bff124e9f76ad5710aa2d7 /changes | |
parent | d016bbaa7dfb3586c682c0070b79e174e8a73c19 (diff) | |
parent | d194f6bedf48410132b03fdab06b679512c14db1 (diff) | |
download | tor-747b74c1825de055bd027c9c74088efdd61d7481.tar.gz tor-747b74c1825de055bd027c9c74088efdd61d7481.zip |
Merge branch 'tor-github/pr/800' into maint-0.4.0
Diffstat (limited to 'changes')
-rw-r--r-- | changes/ticket29357 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/changes/ticket29357 b/changes/ticket29357 new file mode 100644 index 0000000000..3aab930cd4 --- /dev/null +++ b/changes/ticket29357 @@ -0,0 +1,7 @@ + o Minor features (dormant mode): + - Add a DormantCanceledByStartup option to tell Tor that it should + treat a startup event as cancelling any previous dormant state. + Integrators should use this option with caution: it should + only be used if Tor is being started because of something that the + user did, and not if Tor is being automatically started in the + background. Closes ticket 29357. |