Unverified Commit 6a61a020 authored by teor's avatar teor
Browse files

Merge branch 'maint-0.3.3' into maint-0.3.4

parents 52473150 be71cce9
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -690,7 +690,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"
@@ -924,7 +924,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
@@ -1190,7 +1190,7 @@ test_state_transition(void *arg)
  }

 done:
  sr_state_free();
  sr_state_free_all();
}

static void