[tor-commits] [tor/master] Merge remote-tracking branch 'public/deprecation_v2'

[nickm@xxxxxxxxxxxxxx]

commit 507f07de098a14d54dfc2a2fdc603b49d563ef01
Merge: 5aad921 f5dcab8
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Aug 19 19:58:51 2016 -0400

    Merge remote-tracking branch 'public/deprecation_v2'

 doc/tor.1.txt                |  4 ++
 src/or/config.c              | 93 +++++++++++++++++++++++++++++++++++++++-----
 src/or/config.h              |  4 +-
 src/or/confparse.c           | 55 ++++++++++++++++++++++----
 src/or/confparse.h           | 13 ++++++-
 src/or/control.c             |  5 ++-
 src/or/shared_random_state.c |  3 +-
 src/or/statefile.c           |  3 +-
 src/test/test_options.c      | 12 +++---
 9 files changed, 162 insertions(+), 30 deletions(-)

diff --cc src/or/config.c
index 06ce161,a57b83e..c1f82c8
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -2142,8 -2192,8 +2181,8 @@@ options_trial_assign(config_line_t *lis
    or_options_t *trial_options = config_dup(&options_format, get_options());
  
    if ((r=config_assign(&options_format, trial_options,
-                        list, use_defaults, clear_first, msg)) < 0) {
+                        list, flags, msg)) < 0) {
 -    config_free(&options_format, trial_options);
 +    or_options_free(trial_options);
      return r;
    }
  



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits