[tor-commits] [sbws/master] Merge branch 'bug28661'

[juga at torproject.org]

commit 7870cacfc19b8ee3d8a5f11e0f81ae833d46bd0e
Merge: c2b85b3 61694ce
Author: juga0 <juga at riseup.net>
Date:   Thu Dec 13 09:30:19 2018 +0000

    Merge branch 'bug28661'

 CHANGELOG.md                  | 5 +++--
 INSTALL.rst                   | 5 ++++-
 docs/source/documenting.rst   | 2 +-
 docs/source/specification.rst | 3 ++-
 docs/source/testing.rst       | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --cc docs/source/documenting.rst
index 016b98a,3d5e155..dad0994
--- a/docs/source/documenting.rst
+++ b/docs/source/documenting.rst
@@@ -45,5 -44,4 +45,5 @@@ They are included in most distributions
  .. _Sphinx: https://www.sphinx-doc.org
  .. _recommonmark: https://recommonmark.readthedocs.io/
  .. _Pylint: https://www.pylint.org/
- .. _Tex: http://www.tug.org/texlive/acquire.html
+ .. _Tex: https://www.tug.org/texlive/acquire.html
 +.. _dvipng: https://www.nongnu.org/dvipng/