commit 6ba5480bc1d9542aa7d5962f3ea9f0f2567116d7
Merge: 9aa7ebc fb5a858
Author: Nick Mathewson
Date: Fri Oct 9 10:13:28 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
changes/geoip-july2015 |3 +
changes/geoip-september2015 |3 +
src/config/geo
commit 407441c6529a5537ac759e6f5180b506df61440f
Merge: 9ccf019 26c344a
Author: Nick Mathewson
Date: Wed May 13 11:05:05 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
changes/bug15850 |4 +
changes/geoip-april2015 |3 +
changes/geoip6-apri
commit dad35227127994847e81d9bee66fb9d0b988267d
Merge: 407441c 614d9bc
Author: Nick Mathewson
Date: Wed May 13 11:05:50 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
changes/bug15823 |4
src/or/rendservice.c | 18 ++
2 files
commit 164c8349fb445ecb3dded9547bd61cfbaeaf6ee8
Merge: b3f24b5 0475552
Author: Nick Mathewson
Date: Mon Apr 6 09:30:54 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
changes/bug15600 |5 +
changes/bug15601 |4
src/or/rendcommon.c
commit 3eff8f38a5c2c3b65716cee7cda09a7458c94d7f
Merge: 97ca025 c113544
Author: Nick Mathewson
Date: Tue Mar 24 09:34:39 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
changes/bug15436 |4
src/ext/csiphash.c | 16 +---
2 files chang
commit bbf304be26b5d677bb08d91e8c41a4ba478a1f63
Merge: 91f7771 a0f892f
Author: Nick Mathewson
Date: Wed Mar 18 09:06:21 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
changes/ticket15176 |3 ++
src/or/main.c | 105 +++
commit 0cbef8be8811a5ecb3df74b0c433cdb558ed19e7
Merge: 65ef97a 5c08a19
Author: Nick Mathewson
Date: Mon Mar 9 13:36:39 2015 -0400
Merge remote-tracking branch 'origin/maint-0.2.6' into release-0.2.6
Makefile.am |2 +-
changes/15188|3 +++
changes/b
