commit 8b393afa94891cb7d4d0371ff38469fbabbe61b3
Merge: 1db6eb6 fe86be6
Author: Nick Mathewson
Date: Fri Mar 18 12:44:37 2011 -0400
Merge remote branch 'origin/maint-0.2.2'
Trivial Conflicts:
configure.in
changes/bug2696 |5 +
configure.in| 22 +++
commit 737228ed8e81de6619a29bd039d08d959d4164da
Merge: 4dde69a c5ffd44
Author: Nick Mathewson
Date: Tue Mar 15 17:18:29 2011 -0400
Merge remote branch 'origin/maint-0.2.2'
changes/bug2756 | 11 +++
src/or/connection.c |2 ++
src/or/connection_edge.c | 17
commit 4dde69a6d003682217c2bf6327b5923c7b811974
Merge: c42bd52 ab41844
Author: Nick Mathewson
Date: Tue Mar 15 15:19:38 2011 -0400
Merge remote branch 'origin/maint-0.2.2'
changes/bug2757 |6 ++
src/or/connection.c |2 +-
2 files changed, 7 insertions(+), 1 deletions(-)
_
commit c42bd529dea474db1a1af4432b9fe5552c0ca07e
Merge: 84f27eb 5938804
Author: Nick Mathewson
Date: Tue Mar 15 15:14:28 2011 -0400
Merge remote branch 'origin/maint-0.2.2'
src/or/rendclient.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit 84f27eb051e0a770b16babd3c12198e16bd8537e
Merge: f038b45 98abe14
Author: Nick Mathewson
Date: Tue Mar 15 14:50:42 2011 -0400
Merge remote branch 'origin/maint-0.2.2'
changes/bug2683a |3 +++
changes/log-typo-2011-03-15-01 |3 +++
src/or/directory.c
commit ebf6786ab3597ec96ef2c026d7dc32c26fbc84e4
Merge: 50c9d31 b97d9ab
Author: Nick Mathewson
Date: Mon Mar 14 17:22:38 2011 -0400
Merge remote branch 'origin/maint-0.2.2'
Fixed conflict: router_get_my_routerinfo now returns const
Conflicts:
src/or/router.c
chang
commit d52a99dc77dc77008b871da8bb2f95995d1abb6a
Merge: 0b07b5d d34a5cd
Author: Nick Mathewson
Date: Fri Mar 11 23:34:46 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
changes/hsdir_assignment |8
src/or/dirserv.c | 19 ++-
src/or/dirvote.c
commit 4740311d182f5a635f0761b9968f6511509894c0
Merge: 92e607d 48c4d53
Author: Nick Mathewson
Date: Thu Mar 10 16:11:39 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
doc/HACKING |9 -
1 files changed, 8 insertions(+), 1 deletions(-)
_
commit 92e607d951c87bdc3e35d9bf3cfedcd0c39e9ae8
Merge: dc0bb6b 78d5955
Author: Nick Mathewson
Date: Wed Mar 9 16:22:50 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists
commit 19baca4837557cf25760fb80478bf3f9ad6822e1
Merge: b5f2b44 f31ba6a
Author: Nick Mathewson
Date: Wed Mar 9 16:20:14 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
changes/bug2574|3 +++
contrib/suse/tor.sh.in |8
2 files changed, 11 insertions(+), 0 deleti
commit 63651b919183e1b0a126109646030aca975344bd
Merge: cb3c3c6 0044697
Author: Nick Mathewson
Date: Tue Mar 8 16:20:53 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
Trivial conflicts fixed in or.h
Conflicts:
src/or/or.h
changes/bug2250 |5 +
src/or/
commit d5907e7d9d79297cc7359aeae810972a1b834e23
Merge: 26009a3 9ad083d
Author: Nick Mathewson
Date: Tue Mar 8 15:23:30 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
changes/bug2629 |5 +
doc/HACKING | 10 +-
src/or/circuitbuild.c |3 ++-
3 files
commit 26009a3ed06549b7d7def9b96b327b906db16bd8
Merge: 176e8a0 3bd83b8
Author: Nick Mathewson
Date: Mon Mar 7 17:12:08 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
changes/bug2660 |7 +++
src/common/address.c | 18 +-
2 files changed, 16 insertions(+)
commit 176e8a0a2aa25839a8ad9f921971703cdd331eb0
Merge: 07b8b43 35fcec3
Author: Nick Mathewson
Date: Sun Mar 6 13:46:11 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/or/routerparse.c
changes/all_descs|4
changes/ipv6_crash |5 +++--
commit 07b8b439c4bee7545a26a61160b2860b18b88185
Merge: c6d8e75 ed14888
Author: Nick Mathewson
Date: Sun Mar 6 13:23:02 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
changes/ipv6_crash |3 +++
src/or/policies.c|2 ++
src/or/routerparse.c |2 --
3 files changed, 5 in
commit c6d8e75dc3aafe7b9a658221ac3bcd4a5936ff9b
Merge: f608872 1d6af67
Author: Nick Mathewson
Date: Fri Mar 4 00:25:14 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
doc/tor.1.txt |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --combined doc/tor.1.txt
index 8897141
commit d60a7c2f8d139d2b2dfd71780dae8a86489cec49
Merge: 42c1a47 6b74081
Author: Nick Mathewson
Date: Tue Mar 1 17:15:37 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
src/or/rephist.c | 12 +---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --combined src/or/rephist
commit 92651641807c861c8f66ec3f117fbf3121450ad3
Merge: f16178c 16b8b9b
Author: Nick Mathewson
Date: Tue Feb 22 18:41:06 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
There was a conflict from the node_t transition, but it was an easy fix.
Conflicts:
src/or/ci
commit f16178c08fce1255d06cd5410a626e351f679ef2
Merge: c2f111a 530e87c
Author: Nick Mathewson
Date: Tue Feb 22 18:25:16 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
doc/tor.1.txt |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --combined doc/tor.1.txt
index 19454a
commit c2f111a631292b38b25635334afd628cb1024265
Merge: bbf782d 596f7a3
Author: Nick Mathewson
Date: Tue Feb 22 17:55:17 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
configure.in
configure.in |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
dif
commit bbf782dc13915c579396d94efbdf87b5c32b70d3
Merge: 3d4c2ff 06deec1
Author: Nick Mathewson
Date: Tue Feb 22 17:21:34 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
___
tor-commits mailing list
tor-commits@lists.torproject.org
https://list
commit 3d4c2ffa30e75b25f1fc1bacbc224ce8b69b68ba
Merge: 108f48d e606f19
Author: Nick Mathewson
Date: Tue Feb 22 15:58:50 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
changes/torspec.git |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
_
commit b7f201f74606aff1f77551449bebe8783a59733a
Merge: 46b0746 cdc59c1
Author: Nick Mathewson
Date: Tue Feb 22 14:10:42 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/or/policies.c
src/or/policies.h
changes/bug2366 |8
src/or/pol
commit 933ffd536daf5b00e1ddcb517b2e4e73f2bcb286
Merge: ce4f879 613073e
Author: Nick Mathewson
Date: Tue Feb 22 12:47:47 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
changes/bug2504 |5 +
src/common/compat.c |2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
di
commit d120ee1c63ec52e23f24f3f4f9f80a9896381406
Merge: b99a8d5 19e5b4c
Author: Nick Mathewson
Date: Tue Feb 22 01:03:06 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
changes/bug2572 |5 +
src/or/router.c |2 +-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --com
commit b99a8d54271dfd26c5c3a2d3086226974b32373e
Merge: 90f9caf d673479
Author: Nick Mathewson
Date: Mon Feb 21 16:10:31 2011 -0500
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
doc/spec/Makefile.am
doc/spec/control-spec.txt
doc/spec/dir-spec.txt
26 matches
Mail list logo
