[tor-commits] [tor/release-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

25 Feb 2011


      commit 84cdcc68a944b31a0b138fcf5ac5e9074c27ed5a
Merge: 4f730e4 7605985
Author: Nick Mathewson nickm@torproject.org
Date:   Tue Feb 22 15:57:36 2011 -0500
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Use "ours" strategy" to avoid taking bug2402 fix.

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[tor-commits] [tor/release-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2