Unverified Commit be71cce9 authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'tor-github/pr/731' into maint-0.3.3

parents 3313444e d4b7975c
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -687,7 +687,7 @@ test_vote(void *arg)

 done:
  UNMOCK(trusteddirserver_get_by_v3_auth_digest);
  sr_state_free();
  sr_state_free_all();
}

static const char *sr_state_str = "Version 1\n"
@@ -921,7 +921,7 @@ test_sr_compute_srv(void *arg)

 done:
  UNMOCK(trusteddirserver_get_by_v3_auth_digest);
  sr_state_free();
  sr_state_free_all();
}

/** Return a minimal vote document with a current SRV value set to
@@ -1187,7 +1187,7 @@ test_state_transition(void *arg)
  }

 done:
  sr_state_free();
  sr_state_free_all();
}

static void