Commits · c2dcd9b703b494b404200c6330ef9f0511b79925 · jarl / tor · GitLab

Mar 12, 2015
- Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 · c2dcd9b7
  Nick Mathewson authored Mar 12, 2015
  c2dcd9b7
- Revert "Make TransProxyType ipfw work correctly" · 9063f291
  Nick Mathewson authored Mar 12, 2015
  9063f291
- Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 · 8a060d86
  Nick Mathewson authored Mar 12, 2015
  
  8a060d86
- Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.5 · eecd4109
  Nick Mathewson authored Mar 12, 2015
  
  eecd4109
- Merge branch 'bug15245_026' into maint-0.2.6 · 1a1d431c
  Nick Mathewson authored Mar 12, 2015
  
  1a1d431c
- add an explanatory comment · d4c17162
  Nick Mathewson authored Mar 12, 2015
  
  d4c17162
- Also, add an assertion to assign_onionskin_to_cpuworker · 648af043
  Nick Mathewson authored Mar 12, 2015
  
  648af043
- Fix crash bug when calling cpuworkers_rotate_keyinfo on a client. · 66c81802
  Nick Mathewson authored Mar 12, 2015
  66c81802
- Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 · 354897a1
  Nick Mathewson authored Mar 12, 2015
  
  354897a1
- Bump 025 version to 0.2.5.11 · a00d07ac
  Nick Mathewson authored Mar 12, 2015
  
  a00d07ac
- Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 · b563082a
  Nick Mathewson authored Mar 12, 2015
  
  b563082a
- Bump 0.2.4 version. · 5f46a59b
  Nick Mathewson authored Mar 12, 2015
  
  5f46a59b
- Merge branch 'bug9495_redux_v2' into maint-0.2.6 · a95e18b3
  Nick Mathewson authored Mar 12, 2015
  
  a95e18b3
- Use PTHREAD_CREATE_DETACHED macro instead of 1: fix Solaris crash · 192ed944
  Nick Mathewson authored Mar 12, 2015
  192ed944
Mar 10, 2015
- Fix check-spaces · 985687bc
  Nick Mathewson authored Mar 10, 2015
  
  985687bc
- bump 0.2.6 to 0.2.6.4-rc-dev · 99b59dee
  Nick Mathewson authored Mar 10, 2015
  
  99b59dee
Mar 09, 2015
- Merge remote-tracking branch 'public/bug15205_025' into maint-0.2.6 · 1af67d7f
  Nick Mathewson authored Mar 09, 2015
  
  1af67d7f
- Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 · 7c9be64e
  Nick Mathewson authored Mar 09, 2015
  
  7c9be64e
- Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 · 306f2f0e
  Nick Mathewson authored Mar 09, 2015
  
  306f2f0e
- Merge remote-tracking branch 'karsten/geoip6-mar2015' into maint-0.2.4 · 220e9be0
  Nick Mathewson authored Mar 09, 2015
  
  220e9be0
- Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 · 5588e677
  Nick Mathewson authored Mar 09, 2015
  
  5588e677
- Update geoip6 to the March 3 2015 database. · 62714068
  Karsten Loesing authored Mar 09, 2015
  
  62714068
- Update geoip to the March 3 2015 database. · beda8d29
  Karsten Loesing authored Mar 09, 2015
  
  beda8d29
- Don't use checked strl{cat,cpy} on OSX. · 24c031b1
  Nick Mathewson authored Mar 09, 2015
  24c031b1
- We actually merged this one a while ago. · c066f2d3
  Nick Mathewson authored Mar 09, 2015
  
  c066f2d3
- Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 · 5c08a19e
  Nick Mathewson authored Mar 09, 2015
  
  5c08a19e
- Restore c89 in 0.2.5 · 64bfc293
  Nick Mathewson authored Mar 09, 2015
  
  64bfc293
- Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 · 8450f6e9
  Nick Mathewson authored Mar 09, 2015
  
  8450f6e9
- Merge remote-tracking branch 'public/bug14261_025' into maint-0.2.5 · 448bd220
  Nick Mathewson authored Mar 09, 2015
  
  448bd220
- GETINFO bw-event-cache to get information on recent BW events · 62631904
  Nick Mathewson authored Jan 07, 2015
  62631904
- Merge remote-tracking branch 'public/bug13988_025' into maint-0.2.5 · e3408248
  Nick Mathewson authored Mar 09, 2015
  
  e3408248
- Merge remote-tracking branch 'public/bug15088_025' into maint-0.2.5 · 410ce4cb
  Nick Mathewson authored Mar 09, 2015
  
  410ce4cb
- Merge remote-tracking branch 'public/feature15006_026' into maint-0.2.6 · fb0de57b
  Nick Mathewson authored Mar 09, 2015
  
  fb0de57b
- Changes file for 15188 · 42d877f0
  Nick Mathewson authored Mar 09, 2015
  
  42d877f0
- testing_common.c: avoid side-effects of tor_assert · d39ede7f
  Tom van der Woerdt authored Mar 08, 2015 and Nick Mathewson committed Mar 09, 2015
  
  d39ede7f
- Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6 · a7f75b20
  Nick Mathewson authored Mar 09, 2015
  
  a7f75b20
- Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 · 1a7419c3
  Nick Mathewson authored Mar 09, 2015
  
  1a7419c3
- Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 · 6704e18d
  Nick Mathewson authored Mar 09, 2015
  
  6704e18d
- Adjust changes header · addffcc1
  Nick Mathewson authored Mar 09, 2015
  
  addffcc1
Mar 04, 2015
- Revert "Missing dependencies; fixes 15127." · de2c5ad8
  Nick Mathewson authored Mar 04, 2015
  de2c5ad8