commit 7d845976e3897fac8e78a4a26688ac57b660151b
Merge: 877dd1d6c 920208776
Author: Nick Mathewson
Date: Thu Dec 21 10:43:06 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.8
changes/bug24666 | 7
src/or/circuitmux.c| 34 +--
src/or/circuitmux.h
commit 877dd1d6c8038cdef48a12a128eb08ae02ac628b
Merge: f7151387d 428f8a375
Author: Nick Mathewson
Date: Wed Dec 20 12:15:23 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.8
changes/geoip-2017-12-06 | 4 +
src/config/geoip | 12380 +++--
commit f7151387d937bd1113f4c694b170305d80dde9fa
Merge: bc1ea4f47 1deda2106
Author: Nick Mathewson
Date: Mon Dec 11 16:56:31 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.8
changes/bug24167| 7 +++
src/or/connection.c | 4
2 files changed, 11 insertions(+)
_
commit bc1ea4f470734f7fa22949318a98e286da5cba49
Merge: f97f301b5 f5d4bdf30
Author: Nick Mathewson
Date: Mon Dec 11 16:54:11 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.8
changes/ticket23856 | 4
src/or/rephist.c| 4 ++--
src/or/router.c | 2 +-
3 files changed, 7 ins
commit f97f301b5b5605f559522ffae2159fc4d061817c
Merge: dc3890439 461e34bb3
Author: Nick Mathewson
Date: Fri Dec 1 12:13:39 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.8
changes/bug24480 | 3 +++
src/or/rendservice.c | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
commit dc3890439f156d4c79b153f13f7ecf3393362b29
Merge: 8f858de81 162a087e5
Author: Nick Mathewson
Date: Fri Dec 1 09:34:47 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.8
"ours" merge to avoid version bump.
___
tor-commits mail
commit 2e219291bee2d378344286ba091ba09527b07188
Merge: ba4a9cf0c 6bda6777c
Author: Nick Mathewson
Date: Thu Nov 30 12:21:36 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.8
"ours" to avoid version bump
___
tor-commits mailing li
commit ba4a9cf0c094b7a19e1bf44264b1244a23a4b38e
Merge: 3030741b5 f49876d66
Author: Nick Mathewson
Date: Thu Nov 30 12:07:59 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.8
changes/trove-2017-009 | 10 ++
changes/trove-2017-011 | 8
changes/trove-2017-0
commit d388f9d879ebedf05c7f399f8b8eb3df9c43d3af
Merge: 800797e7f 831d3b794
Author: Nick Mathewson
Date: Sat Nov 18 11:01:33 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.8
changes/bug18329-minimal | 6 ++
src/or/router.c | 9 +
2 files changed, 15 insertions(+)
commit c9b76a12f5682babd2b8126930107a516cef5eff
Merge: faf568fa7 6f8c32b7d
Author: Nick Mathewson
Date: Sat Nov 11 12:23:33 2017 -0500
Merge branch 'maint-0.2.5' into maint-0.2.8
changes/geoip-2017-11-06 |4 +
src/config/geoip | 9406 ---
commit faf568fa7e8cfbebc236b6aef743251b7e6b9df4
Merge: 9969b0dfd 82f8b27ff
Author: Nick Mathewson
Date: Wed Oct 25 09:28:15 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.8
"ours" merge to avoid version bump
___
tor-commits mail
commit 912ebf165f6a3e7385118cf78a4107f25b0ad5de
Merge: d4befa035 743eee493
Author: Nick Mathewson
Date: Tue Oct 24 09:10:04 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.8
"ours" merge to avoid version bump
___
tor-commits mail
commit 8cc147aa834b076233c5448992e145b908123908
Merge: 9a1b38546 15a699462
Author: Nick Mathewson
Date: Mon Oct 23 09:04:56 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.8
changes/ticket23910 | 3 +++
src/or/config.c | 3 +++
2 files changed, 6 insertions(+)
diff --cc src/or/c
commit 9a1b385462556b36dc08265eb9d96958e9d2ed29
Merge: 6f87a8589 5d219ecf9
Author: Nick Mathewson
Date: Mon Oct 23 08:58:28 2017 -0400
Merge branch 'maint-0.2.5' into maint-0.2.8
changes/longclaw_23592 | 3 +++
src/or/config.c| 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
14 matches
Mail list logo