Merge branch 'maint-0.2.9' into release-0.2.9
This commit is contained in:
commit
d83aa8c90a
|
@ -0,0 +1,7 @@
|
||||||
|
o Minor bugfixes (circuit, hidden service)
|
||||||
|
- When closing a circuit, the reason for doing so was assigned from an int
|
||||||
|
value to a uint16_t which is quite a problem for negative values that are
|
||||||
|
our internal reasons (ex: END_CIRC_REASON_IP_NOW_REDUNDANT). On the HS
|
||||||
|
side, this was causing introduction points to be flagged as unusable
|
||||||
|
because the reason wasn't the right one due to the bad conversion.
|
||||||
|
Partially fixes bug 21056 and fixes bug 20307; Bugfix on 0.2.8.1-alpha.
|
|
@ -2964,11 +2964,11 @@ typedef struct circuit_t {
|
||||||
/** For what reason (See END_CIRC_REASON...) is this circuit being closed?
|
/** For what reason (See END_CIRC_REASON...) is this circuit being closed?
|
||||||
* This field is set in circuit_mark_for_close and used later in
|
* This field is set in circuit_mark_for_close and used later in
|
||||||
* circuit_about_to_free. */
|
* circuit_about_to_free. */
|
||||||
uint16_t marked_for_close_reason;
|
int marked_for_close_reason;
|
||||||
/** As marked_for_close_reason, but reflects the underlying reason for
|
/** As marked_for_close_reason, but reflects the underlying reason for
|
||||||
* closing this circuit.
|
* closing this circuit.
|
||||||
*/
|
*/
|
||||||
uint16_t marked_for_close_orig_reason;
|
int marked_for_close_orig_reason;
|
||||||
|
|
||||||
/** Unique ID for measuring tunneled network status requests. */
|
/** Unique ID for measuring tunneled network status requests. */
|
||||||
uint64_t dirreq_id;
|
uint64_t dirreq_id;
|
||||||
|
|
Loading…
Reference in New Issue