[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2016-01-07 Thread nickm
commit 3569cffe1441e2e8c754feffcdc229e9a2680d0d Merge: 809217e 62b02a1 Author: Nick Mathewson Date: Fri Oct 9 10:12:59 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-october2015 |3 + src/config/geoip | 7429 +++

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-10-09 Thread nickm
commit 809217e6f3665e20718a406871585fa932dd4578 Merge: 01bb260 8b3e0b7 Author: Nick Mathewson Date: Thu Sep 24 10:06:00 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-september2015 |3 + src/config/geoip| 3977 ++

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-10-09 Thread nickm
commit 01bb260f3108688f2ca54b1eea813980dd94ea1f Merge: fd082c3 7004d67 Author: Nick Mathewson Date: Wed Jul 29 10:47:07 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-july2015 |3 + src/config/geoip | 2975

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-07-10 Thread nickm
commit fd082c394bf392cab0c586313a82d5bb3bbd6139 Merge: 75388f6 fde4199 Author: Nick Mathewson Date: Thu Jun 25 11:43:04 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-june2015 |3 + changes/geoip6-june2015 |3 + src/config/geoip

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-05-13 Thread nickm
commit 6c7720ed49623f649aa6280606c129ee153b04ed Merge: 3a5d4d6 efae1bc Author: Nick Mathewson Date: Mon Apr 27 14:16:55 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-april2015 |3 + changes/geoip6-april2015 |2 + src/config/geoip

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-04-06 Thread nickm
commit 5633261f2e902e5b6c5956738febab9a180760d6 Merge: fe69a7e 542100d Author: Nick Mathewson Date: Mon Apr 6 09:55:44 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 ___ tor-commits mailing list tor-commits@lists

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-04-06 Thread nickm
commit fe69a7e1d7658d3202af0c2c7308d342faaa1559 Merge: 3781955 7451b4c Author: Nick Mathewson Date: Mon Apr 6 09:25:37 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/bug15600 |5 + changes/bug15601 |4 src/or/rendcommon.c |

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-04-03 Thread nickm
commit 3781955f079f25f8d6aa47cb746e339497076050 Merge: 9063f29 01e4bc8 Author: Nick Mathewson Date: Fri Apr 3 09:38:54 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/bug15515 |4 src/or/or.h |3 +++ src/or/rendmid.c | 14 +

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-03-12 Thread nickm
commit b563082ad87448066f950fe581b47f1533b78341 Merge: 306f2f0 5f46a59 Author: Nick Mathewson Date: Thu Mar 12 10:51:08 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 ___ tor-commits mailing list tor-commits@list

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-03-09 Thread nickm
commit 306f2f0eff1b7d1c4bbee8b600a962d537c566f3 Merge: 64bfc29 220e9be Author: Nick Mathewson Date: Mon Mar 9 16:24:44 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/geoip-march2015 |3 + changes/geoip6-march2015 |3 + src/config/geoip

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-03-09 Thread nickm
commit 51e36026e5b04384bf3311354ef0cd5a5cbf2d59 Merge: 1525eee 2bcb596 Author: Nick Mathewson Date: Tue Feb 24 13:24:57 2015 -0500 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 ___ tor-commits mailing list tor-commits@list

[tor-commits] [tor/release-0.2.6] Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5

2015-03-09 Thread nickm
commit 1a7419c3df300483f111923daca43febc33b368b Merge: 51e3602 6704e18 Author: Nick Mathewson Date: Mon Mar 9 11:09:30 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +-- 2 files changed, 19