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

commit cb8c5c023f0e349f30fd6a539437d76358b8b87a Merge: efae1bc e5907e9 Author: Nick Mathewson ni...@torproject.org Date: Thu Jun 25 11:42:31 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-june2015 |3 + src/config/geoip |14347

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

commit 609cdec112bfbe37947a58f2fe2790ee3a2660eb Merge: 542100d bcc0a48 Author: Nick Mathewson ni...@torproject.org Date: Mon Apr 27 14:15:44 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-april2015 |3 + src/config/geoip|10061

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

commit 6704e18dd2e09111eeca0c76fb00a459f9da98ea Merge: 2bcb596 addffcc Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 11:08:57 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug15083 | 10 ++ src/or/buffers.c | 11 +--

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

commit 5588e677bd61b56520fd73ffcfd759e39f1d226b Merge: 6704e18 beda8d2 Author: Nick Mathewson ni...@torproject.org Date: Mon Mar 9 16:23:55 2015 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-march2015 |3 + src/config/geoip|12695