Merge remote-tracking branch 'teor/comment24575'

This commit is contained in:
Nick Mathewson 2017-12-11 09:46:23 -05:00
commit 030d3d52f5

View File

@ -1685,7 +1685,7 @@ options_transition_affects_guards(const or_options_t *old,
const or_options_t *new) const or_options_t *new)
{ {
/* NOTE: Make sure this function stays in sync with /* NOTE: Make sure this function stays in sync with
* entry_guards_set_filtered_flags */ * node_passes_guard_filter */
tor_assert(old); tor_assert(old);
tor_assert(new); tor_assert(new);