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

src/or/rephist.h

+1 −3
Original line number Diff line number Diff line
@@ -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

src/test/test_relay.c

+2 −0
Original line number Diff line number Diff line
@@ -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);