diff options
author | Nick Mathewson <nickm@torproject.org> | 2015-02-19 09:56:38 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2015-02-19 09:56:38 -0500 |
commit | 0cdc321ae97618b2ca92c82e25cc43c25800aad9 (patch) | |
tree | 49bf03b07423d14526d57a18117d86bc66011c53 /changes | |
parent | 4fde9cdf86849aff5d757b413b6e5da81cdb1218 (diff) | |
download | tor-0cdc321ae97618b2ca92c82e25cc43c25800aad9.tar.gz tor-0cdc321ae97618b2ca92c82e25cc43c25800aad9.zip |
Merge changes into changelog
Diffstat (limited to 'changes')
-rw-r--r-- | changes/bug12844_macros | 4 | ||||
-rw-r--r-- | changes/bug13762_quiet | 5 |
2 files changed, 0 insertions, 9 deletions
diff --git a/changes/bug12844_macros b/changes/bug12844_macros deleted file mode 100644 index feee7c8b3e..0000000000 --- a/changes/bug12844_macros +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features (compilation): - - Do not compile any code related to Tor2Web mode when Tor2Web mode - is not enabled at compile time. Previously, this code was included - in a disabled state. See discussion on ticket 12844. diff --git a/changes/bug13762_quiet b/changes/bug13762_quiet deleted file mode 100644 index df541ccb98..0000000000 --- a/changes/bug13762_quiet +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (directory authority): - - Do not attempt to download extrainfo documents which we will be - unable to validate with a matching server descriptor. Fixes bug - 13762; bugfix on 0.2.0.1-alpha. - |