diff options
| author | teor <teor2345@gmail.com> | 2015-01-10 17:20:06 +1100 |
|---|---|---|
| committer | teor <teor2345@gmail.com> | 2015-01-10 17:20:06 +1100 |
| commit | f8ffb57bc4430ff9bbd7560eecdda4284b2799ba (patch) | |
| tree | 7b73b0bf39d756c31bb62dbcd3c239864a6a46c8 /changes/bug14106 | |
| parent | debd7862bb6d641c13fe4ee019da633c683d740e (diff) | |
| parent | 33df3e37ffecfed309a1a0f210a96620c0ebb837 (diff) | |
| download | tor-f8ffb57bc4430ff9bbd7560eecdda4284b2799ba.tar.gz tor-f8ffb57bc4430ff9bbd7560eecdda4284b2799ba.zip | |
Merge branch 'master' of https://git.torproject.org/tor into bug13111-empty-key-files-fn-empty
Conflicts:
src/or/connection_edge.c
Merged in favour of origin.
Diffstat (limited to 'changes/bug14106')
| -rw-r--r-- | changes/bug14106 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug14106 b/changes/bug14106 new file mode 100644 index 0000000000..cf6e568dcc --- /dev/null +++ b/changes/bug14106 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden services): + - Successfully launch Tor with a nonexistent hidden service directory. + Our fix for bug 13942 didn't catch this case. Fixes bug 14106; + bugfix on 0.2.6.2-alpha. |