]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Sat, 29 Oct 2011 13:22:58 +0000 (09:22 -0400)
committerNick Mathewson <nickm@torproject.org>
Sat, 29 Oct 2011 13:22:58 +0000 (09:22 -0400)
commit6be596e2dc04a736221b573f73a6324352f8538a
treee1cf7e89647e484b67420d47571bc14f6e9f614c
parent4dd8d811d669e245f95ed0fcc59de579e876ab91
parentc5c5f859d37bc46f912cca9ba0fa0e1300062e40
Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
src/or/config.c