Commits · c67adddacb56f90d77786820f29ca2b4b9f91cae · The Tor Project / Core / Tor · GitLab

Feb 16, 2018
- Remove changes file for 24898-029 backports in maint-0.3.2 · c67addda
  Nick Mathewson authored Feb 16, 2018
  c67addda
- Merge branch 'maint-0.3.1' into maint-0.3.2 · c8b087d9
  Nick Mathewson authored Feb 16, 2018
  
  c8b087d9
- Merge branch 'maint-0.2.9' into maint-0.3.1 · 3930ffdf
  Nick Mathewson authored Feb 16, 2018
  3930ffdf
- stop calling channel_mark_client in response to a create_fast · d21e5cfc
  Roger Dingledine authored Jan 31, 2018 and Nick Mathewson committed Feb 16, 2018
  d21e5cfc
- stop calling channel_mark_client in response to a create_fast · 2b99350c
  Roger Dingledine authored Jan 31, 2018 and Nick Mathewson committed Feb 16, 2018
  2b99350c
- backport to make channel_is_client() accurate · 8d5dcdbd
  Roger Dingledine authored Jan 30, 2018 and Nick Mathewson committed Feb 16, 2018
  8d5dcdbd
Feb 13, 2018
- Merge branch 'maint-0.3.1' into maint-0.3.2 · cb9a322b
  Nick Mathewson authored Feb 13, 2018
  
  cb9a322b
- Merge branch 'maint-0.2.9' into maint-0.3.1 · f647035b
  Nick Mathewson authored Feb 13, 2018
  
  f647035b
- fix make check-changes · f0ed7895
  Taylor Yu authored Feb 13, 2018
  
  f0ed7895
- Merge branch 'maint-0.3.1' into maint-0.3.2 · b062730a
  Nick Mathewson authored Feb 13, 2018
  
  b062730a
- Merge branch 'maint-0.2.9' into maint-0.3.1 · 17a92394
  Nick Mathewson authored Feb 13, 2018
  
  17a92394
- dirserv: Improve returned message when relay is rejected · e658dad6
  David Goulet authored Feb 08, 2018 and Nick Mathewson committed Feb 13, 2018
  e658dad6
Feb 12, 2018
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 021c3bd5
  Nick Mathewson authored Feb 12, 2018
  
  021c3bd5
- Merge branch 'maint-0.2.9' into maint-0.3.1 · 91109bc8
  Nick Mathewson authored Feb 12, 2018
  
  91109bc8
- Merge branch 'bug23318-redux_029' into maint-0.2.9 · e91bae66
  Nick Mathewson authored Feb 12, 2018
  
  e91bae66
Feb 11, 2018
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 98fc8cd9
  Nick Mathewson authored Feb 11, 2018
  
  98fc8cd9
- Merge branch 'maint-0.2.9' into maint-0.3.1 · b2c4d4e7
  Nick Mathewson authored Feb 11, 2018
  
  b2c4d4e7
- Merge remote-tracking branch 'public/bug24198_029' into maint-0.2.9 · 84c13336
  Nick Mathewson authored Feb 11, 2018
  
  84c13336
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 67043d95
  Nick Mathewson authored Feb 11, 2018
  
  67043d95
- Merge branch 'maint-0.2.9' into maint-0.3.1 · 8939eaf4
  Nick Mathewson authored Feb 11, 2018
  
  8939eaf4
- Merge branch 'ticket24315_029' into maint-0.2.9 · 848ba26c
  Nick Mathewson authored Feb 11, 2018
  
  848ba26c
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 684d57fe
  Nick Mathewson authored Feb 11, 2018
  
  684d57fe
- Merge branch 'maint-0.2.9' into maint-0.3.1 · eccef6ba
  Nick Mathewson authored Feb 11, 2018
  
  eccef6ba
- Merge remote-tracking branch 'public/bug21074_029' into maint-0.2.9 · 5dc785ce
  Nick Mathewson authored Feb 11, 2018
  
  5dc785ce
Feb 10, 2018
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 4de20d17
  Nick Mathewson authored Feb 10, 2018
  
  4de20d17
- Merge branch 'maint-0.2.9' into maint-0.3.1 · 86583ad7
  Nick Mathewson authored Feb 10, 2018
  
  86583ad7
- Merge branch 'bug24978_029_enable' into maint-0.2.9 · 320dac46
  Nick Mathewson authored Feb 10, 2018
  
  320dac46
Feb 08, 2018
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 84bc75b2
  Nick Mathewson authored Feb 08, 2018
  
  84bc75b2
- Merge branch 'maint-0.2.9' into maint-0.3.1 · 04a8e81f
  Nick Mathewson authored Feb 08, 2018
  
  04a8e81f
- Merge branch 'maint-0.2.5' into maint-0.2.9 · 0ddc2dc5
  Nick Mathewson authored Feb 08, 2018
  
  0ddc2dc5
- Update geoip and geoip6 to the February 7 2018 database. · f1278b7e
  Karsten Loesing authored Feb 08, 2018
  
  f1278b7e
Feb 02, 2018
- Merge branch 'bug25125_032_01_squashed' into maint-0.3.2 · 4ceae7c6
  Nick Mathewson authored Feb 02, 2018
  
  4ceae7c6
- sched: When releasing a channel, do not BUG() if absent from the pending list · 005e228f
  David Goulet authored Feb 02, 2018 and Nick Mathewson committed Feb 02, 2018
  005e228f
Feb 01, 2018
- Merge remote-tracking branch 'dgoulet/bug24700_032_01' into maint-0.3.2 · 77634795
  Nick Mathewson authored Feb 01, 2018
  
  77634795
- sched: Use the sched_heap_idx field to double-check our fix for 24700. · cb5654f3
  Nick Mathewson authored Feb 01, 2018 and David Goulet committed Feb 01, 2018
  cb5654f3
- Merge branch 'maint-0.3.1' into maint-0.3.2 · 31542cc3
  Nick Mathewson authored Feb 01, 2018
  
  31542cc3
- Merge remote-tracking branch 'teor/bug25070_031' into maint-0.3.1 · 9cbc40e3
  Nick Mathewson authored Feb 01, 2018
  
  9cbc40e3
- Merge remote-tracking branch 'dgoulet/bug24975_032_01' into maint-0.3.2 · 61cb2993
  Nick Mathewson authored Feb 01, 2018
  
  61cb2993
Jan 31, 2018
- Merge branch 'bug25105_032' into maint-0.3.2 · 56857291
  Nick Mathewson authored Jan 31, 2018
  
  56857291
- ns: Add a before and after consensus has changed notification · fbc455cb
  David Goulet authored Jan 31, 2018
  fbc455cb