[tor-commits] [tor/master] Merge branch 'tor-github/pr/1031'

[dgoulet at torproject.org]

commit 8e112cecd8cf944e095304257563415e60891780
Merge: e9d99d2e1 58cb98af3
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jun 11 11:46:38 2019 -0400

    Merge branch 'tor-github/pr/1031'

 changes/ticket29738            |  6 ++++++
 doc/tor.1.txt                  |  6 ------
 src/app/config/config.c        |  9 +--------
 src/app/config/or_options_st.h |  1 -
 src/feature/dirauth/dirvote.c  | 26 --------------------------
 src/test/test_options.c        | 24 ------------------------
 6 files changed, 7 insertions(+), 65 deletions(-)