 Nick Mathewson
|
98fc8cd937
Merge branch 'maint-0.3.1' into maint-0.3.2
|
7 years ago |
|
Nick Mathewson
|
b2c4d4e7fa
Merge branch 'maint-0.2.9' into maint-0.3.1
|
7 years ago |
|
Nick Mathewson
|
84c13336c4
Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9
|
7 years ago |
|
Nick Mathewson
|
67043d957f
Merge branch 'maint-0.3.1' into maint-0.3.2
|
7 years ago |
|
Nick Mathewson
|
8939eaf479
Merge branch 'maint-0.2.9' into maint-0.3.1
|
7 years ago |
|
Nick Mathewson
|
848ba26c18
Merge branch 'ticket24315_029' into maint-0.2.9
|
7 years ago |
|
Nick Mathewson
|
684d57fe8a
Merge branch 'maint-0.3.1' into maint-0.3.2
|
7 years ago |
|
Nick Mathewson
|
eccef6ba60
Merge branch 'maint-0.2.9' into maint-0.3.1
|
7 years ago |
|
Nick Mathewson
|
5dc785ceef
Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9
|
7 years ago |
|
Nick Mathewson
|
4de20d1754
Merge branch 'maint-0.3.1' into maint-0.3.2
|
7 years ago |
|
Nick Mathewson
|
86583ad78e
Merge branch 'maint-0.2.9' into maint-0.3.1
|
7 years ago |
|
Nick Mathewson
|
320dac4602
Merge branch 'bug24978_029_enable' into maint-0.2.9
|
7 years ago |
|
Nick Mathewson
|
84bc75b2e7
Merge branch 'maint-0.3.1' into maint-0.3.2
|
7 years ago |
|
Nick Mathewson
|
04a8e81fa9
Merge branch 'maint-0.2.9' into maint-0.3.1
|
7 years ago |
|
Nick Mathewson
|
0ddc2dc531
Merge branch 'maint-0.2.5' into maint-0.2.9
|
7 years ago |
 Karsten Loesing
|
f1278b7e57
Update geoip and geoip6 to the February 7 2018 database.
|
7 years ago |
|
Nick Mathewson
|
4ceae7c6b9
Merge branch 'bug25125_032_01_squashed' into maint-0.3.2
|
7 years ago |
 David Goulet
|
005e228f80
sched: When releasing a channel, do not BUG() if absent from the pending list
|
7 years ago |
|
Nick Mathewson
|
77634795b0
Merge remote-tracking branch 'dgoulet/bug24700_032_01' into maint-0.3.2
|
7 years ago |
|
Nick Mathewson
|
cb5654f300
sched: Use the sched_heap_idx field to double-check our fix for 24700.
|
7 years ago |
|
Nick Mathewson
|
31542cc306
Merge branch 'maint-0.3.1' into maint-0.3.2
|
7 years ago |
|
Nick Mathewson
|
9cbc40e376
Merge remote-tracking branch 'teor/bug25070_031' into maint-0.3.1
|
7 years ago |
|
Nick Mathewson
|
61cb2993dd
Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2
|
7 years ago |
|
Nick Mathewson
|
56857291b0
Merge branch 'bug25105_032' into maint-0.3.2
|
7 years ago |
|
David Goulet
|
fbc455cbd2
ns: Add a before and after consensus has changed notification
|
7 years ago |
|
Nick Mathewson
|
31f2a8771c
Look at the correct protocol for supports_v3_rendezvous_point
|
7 years ago |
|
David Goulet
|
c85f78e74c
Revert "ns: Call notify_networkstatus_changed() after the new consensus is set globally"
|
7 years ago |
|
Nick Mathewson
|
1c39d969b9
Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2
|
7 years ago |
|
David Goulet
|
adaf3e9b89
sched: Avoid adding the same channel twice to the KIST pending list
|
7 years ago |
|
David Goulet
|
df312b3cf6
hs-v3: Remove a BUG() when storing a descriptor in the client cache
|
7 years ago |
