 Nick Mathewson
|
2a49b27b9f
Merge remote-tracking branch 'tor-github/pr/781'
|
6 years ago |
|
Nick Mathewson
|
a80131765a
Merge branch 'maint-0.4.0'
|
6 years ago |
|
Nick Mathewson
|
de5ab1ef49
Merge remote-tracking branch 'tor-github/pr/802' into maint-0.4.0
|
6 years ago |
 teor
|
4c22c11136
Merge branch 'maint-0.4.0'
|
6 years ago |
|
teor
|
b4483edce0
Merge branch 'maint-0.3.5' into maint-0.4.0
|
6 years ago |
|
teor
|
17e3eea685
Merge remote-tracking branch 'tor-github/pr/727' into maint-0.3.5
|
6 years ago |
|
teor
|
af21d126e6
Merge branch 'bug29706_035_minimal_merge' into bug29706_040_minimal_merge
|
6 years ago |
|
teor
|
55865a2c9c
Merge branch 'bug29706_034_minimal_merge' into bug29706_035_minimal_merge
|
6 years ago |
|
teor
|
aec6ee201b
test/sr: update sr_state_free() to sr_state_free_all() in a comment
|
6 years ago |
|
teor
|
1d0146e2a2
Merge branch 'bug29706_029_minimal' into bug29706_034_minimal_merge
|
6 years ago |
|
teor
|
c44ad396f8
test/sr: Clear SRVs after init, and before setup
|
6 years ago |
 George Kadianakis
|
0aaeec19e7
Satisfy practracker broken by #29665 and #28656.
|
6 years ago |
|
Nick Mathewson
|
677384e276
Merge branch 'maint-0.4.0'
|
6 years ago |
|
Nick Mathewson
|
1547fd99a6
Merge branch 'bug28656_035_squashed' into maint-0.4.0
|
6 years ago |
|
teor
|
532f4c9103
Stop logging a BUG() warning when tor is waiting for exit descriptors
|
6 years ago |
|
Nick Mathewson
|
1cffacdaf5
Merge branch 'maint-0.4.0'
|
6 years ago |
|
Nick Mathewson
|
560ba98dd7
Merge remote-tracking branch 'tor-github/pr/776' into maint-0.4.0
|
6 years ago |
|
Nick Mathewson
|
af56dece09
Merge branch 'maint-0.4.0'
|
6 years ago |
|
Nick Mathewson
|
94523bffdc
Merge remote-tracking branch 'tor-github/pr/791' into maint-0.4.0
|
6 years ago |
 David Goulet
|
aee65084b4
circ: Remove n_mux and p_mux members
|
7 years ago |
|
Nick Mathewson
|
2d76945052
practracker: Create an exception for an as-yet-nonexistent file.
|
6 years ago |
 Roger Dingledine
|
a3bc950e42
relays shouldn't close idle rend circuits
|
6 years ago |
|
George Kadianakis
|
a55c89c475
practracker: Be compatible with python2 which is used by travis/jenkins.
|
6 years ago |
|
teor
|
de61669425
Merge branch 'maint-0.4.0'
|
6 years ago |
|
teor
|
feb7253df3
Merge branch 'maint-0.3.5' into maint-0.4.0
|
6 years ago |
|
teor
|
5d41e2223f
Merge branch 'maint-0.3.4' into maint-0.3.5
|
6 years ago |
|
teor
|
e021f89f36
Merge branch 'maint-0.2.9' into maint-0.3.4
|
6 years ago |
|
teor
|
f3b17a6b26
Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4
|
6 years ago |
|
teor
|
c03b1b3f08
Merge remote-tracking branch 'tor-github/pr/794' into maint-0.3.4
|
6 years ago |
|
teor
|
66f944f79b
Merge branch 'bug28096-029-squashed' into bug28096-034-squashed
|
6 years ago |
