diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-07-12 09:24:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-07-12 09:24:01 -0400 |
| commit | 4984d6242af07b3e6b7d64dd2d82ada3fee564a2 (patch) | |
| tree | a423929df5f61093cdcbbf9e609d98da9867f816 /changes | |
| parent | 7b2364035a6f80fd3158e1b6d7b0034989aefb38 (diff) | |
| parent | e111cfcd54662bd6cea86e7a970492b3b80bd723 (diff) | |
| download | tor-4984d6242af07b3e6b7d64dd2d82ada3fee564a2.tar.gz tor-4984d6242af07b3e6b7d64dd2d82ada3fee564a2.zip | |
Merge branch 'maint-0.3.1'
Diffstat (limited to 'changes')
| -rw-r--r-- | changes/bug22892 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changes/bug22892 b/changes/bug22892 new file mode 100644 index 0000000000..9a70cb0576 --- /dev/null +++ b/changes/bug22892 @@ -0,0 +1,4 @@ + o Minor bugfixes (compilation): + - Compile correctly when both openssl 1.1.0 and libscrypt are detected. + Previously this would cause an error. Fixes bug 22892; bugfix on + 0.3.1.1-alpha. |