Unverified Commit 05018d55 authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9

parents 2bc8989d 031ed59d
...@@ -117,9 +117,7 @@ extern uint32_t rephist_total_num; ...@@ -117,9 +117,7 @@ extern uint32_t rephist_total_num;
#ifdef TOR_UNIT_TESTS #ifdef TOR_UNIT_TESTS
extern int onion_handshakes_requested[MAX_ONION_HANDSHAKE_TYPE+1]; extern int onion_handshakes_requested[MAX_ONION_HANDSHAKE_TYPE+1];
extern int onion_handshakes_assigned[MAX_ONION_HANDSHAKE_TYPE+1]; extern int onion_handshakes_assigned[MAX_ONION_HANDSHAKE_TYPE+1];
typedef struct bw_array_t bw_array_t; extern struct bw_array_t *write_array;
extern bw_array_t *write_array;
#endif #endif
#endif #endif
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
static or_circuit_t * new_fake_orcirc(channel_t *nchan, channel_t *pchan); static or_circuit_t * new_fake_orcirc(channel_t *nchan, channel_t *pchan);
static void test_relay_append_cell_to_circuit_queue(void *arg); static void test_relay_append_cell_to_circuit_queue(void *arg);
typedef struct bw_array_t bw_array_t;
uint64_t find_largest_max(bw_array_t *b); uint64_t find_largest_max(bw_array_t *b);
void commit_max(bw_array_t *b); void commit_max(bw_array_t *b);
void advance_obs(bw_array_t *b); void advance_obs(bw_array_t *b);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment