Commit 5591a3bc authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge remote-tracking branch 'tor-gitlab/mr/504'

parents ecffdb0b a86918d5

src/ext/ed25519/donna/test-ticks.h

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ get_ticks(void) { 
		__asm__ __volatile__("rdtsc" : "=a" (lo), "=d" (hi));

		return ((uint64_t)lo | ((uint64_t)hi << 32));

	#else

		need rdtsc for this compiler

		#error need rdtsc for this compiler

	#endif

#elif defined(OS_SOLARIS)

	return (uint64_t)gethrtime();
@@ -35,7 +35,7 @@ get_ticks(void) { 
	t = ((uint64_t)t2.tv_usec << 32) | (uint64_t)t2.tv_sec;

	return t;

#else

	need ticks for this platform

	#error need ticks for this platform

#endif

}

src/feature/client/entrynodes.c

+1 −1
Original line number Diff line number Diff line
@@ -2743,7 +2743,7 @@ entry_guards_upgrade_waiting_circuits(guard_selection_t *gs, 
          {NONPRIMARY_GUARD_CONNECT_TIMEOUT} seconds."

    */

    circuit_guard_state_t *state = origin_circuit_get_guard_state(circ);

    if BUG((state == NULL))

    if (BUG(state == NULL))

      continue;

    if (state->state != GUARD_CIRC_STATE_COMPLETE)

      continue;