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

This commit is contained in:
teor 2019-08-09 13:50:42 +10:00
commit 05018d55ca
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 3 additions and 3 deletions

View File

@ -117,9 +117,7 @@ extern uint32_t rephist_total_num;
#ifdef TOR_UNIT_TESTS
extern int onion_handshakes_requested[MAX_ONION_HANDSHAKE_TYPE+1];
extern int onion_handshakes_assigned[MAX_ONION_HANDSHAKE_TYPE+1];
typedef struct bw_array_t bw_array_t;
extern bw_array_t *write_array;
extern struct bw_array_t *write_array;
#endif
#endif

View File

@ -19,6 +19,8 @@
static or_circuit_t * new_fake_orcirc(channel_t *nchan, channel_t *pchan);
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);
void commit_max(bw_array_t *b);
void advance_obs(bw_array_t *b);