[tor-commits] [translation/whisperback] Update translations for whisperback

2017-10-24 Thread translation 
commit 5ba75a1d9976a6c77c34b7fe1a1c7291a3aa4cec
Author: Translation commit bot 
Date:   Wed Oct 25 03:45:25 2017 +

Update translations for whisperback
---
 tg/tg.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tg/tg.po b/tg/tg.po
index c96a796d5..228fb2609 100644
--- a/tg/tg.po
+++ b/tg/tg.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-03-20 12:09+\n"
-"PO-Revision-Date: 2017-09-19 19:57+\n"
+"PO-Revision-Date: 2017-10-25 03:34+\n"
 "Last-Translator: carolyn \n"
 "Language-Team: Tajik (http://www.transifex.com/otf/torproject/language/tg/)\n"
 "MIME-Version: 1.0\n"
@@ -211,4 +211,4 @@ msgstr "Help"
 
 #: ../data/whisperback.ui.h:30
 msgid "Send"
-msgstr ""
+msgstr "Фиристодан"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2017-10-24 Thread translation 
commit de9ea15ceb51625fb2cce197abd35d4945dc7536
Author: Translation commit bot 
Date:   Wed Oct 25 03:15:56 2017 +

Update translations for liveusb-creator
---
 zh_CN/zh_CN.po | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 2815e873b..f5db42c44 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -25,7 +25,7 @@ msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-09-25 14:02+0200\n"
-"PO-Revision-Date: 2017-10-25 02:45+\n"
+"PO-Revision-Date: 2017-10-25 02:46+\n"
 "Last-Translator: Birkhoff \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -515,7 +515,7 @@ msgstr ""
 
 #: ../data/tails-installer.ui.h:4
 msgid "Select a distribution to download:"
-msgstr "选择一个要下载的发行版："
+msgstr "选择一个您想要下载的发行版："
 
 #: ../data/tails-installer.ui.h:5
 msgid "Target USB stick:"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd

2017-10-24 Thread translation 
commit 779536e9c16cae553c21879b7adfcadf87e71b12
Author: Translation commit bot 
Date:   Wed Oct 25 02:47:48 2017 +

Update translations for torbutton-torbuttondtd
---
 zh_CN/torbutton.dtd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zh_CN/torbutton.dtd b/zh_CN/torbutton.dtd
index 16bbfda27..c02f2c44d 100644
--- a/zh_CN/torbutton.dtd
+++ b/zh_CN/torbutton.dtd
@@ -41,7 +41,7 @@
 
 
 
-
+
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/liveusb-creator] Update translations for liveusb-creator

2017-10-24 Thread translation 
commit 807dcf6de5e99dca46aafa4d9f58653522d6f090
Author: Translation commit bot 
Date:   Wed Oct 25 02:45:54 2017 +

Update translations for liveusb-creator
---
 zh_CN/zh_CN.po | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/zh_CN/zh_CN.po b/zh_CN/zh_CN.po
index 422902d18..2815e873b 100644
--- a/zh_CN/zh_CN.po
+++ b/zh_CN/zh_CN.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # khi, 2013
+# Birkhoff , 2017
 # Chi-Hsun Tsai, 2017
 # g ghost, 2017
 # paperbag, 2016
@@ -23,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Tor Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-09-20 18:02+0200\n"
-"PO-Revision-Date: 2017-09-23 18:36+\n"
-"Last-Translator: carolyn \n"
+"POT-Creation-Date: 2017-09-25 14:02+0200\n"
+"PO-Revision-Date: 2017-10-25 02:45+\n"
+"Last-Translator: Birkhoff \n"
 "Language-Team: Chinese (China) 
(http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -140,7 +141,7 @@ msgstr "不支持的文件系统：%s"
 #: ../tails_installer/creator.py:788
 #, python-format
 msgid "Unknown GLib exception while trying to mount device: %(message)s"
-msgstr "尝试安装下列设备时遇到未知的 GLib 异常：%(message)s"
+msgstr "尝试挂载设备时遇到未知的 GLib 异常：%(message)s"
 
 #: ../tails_installer/creator.py:792
 #, python-format
@@ -234,7 +235,7 @@ msgstr "无法找到 syslinux 的 gptmbr.bin"
 #: ../tails_installer/creator.py:1279
 #, python-format
 msgid "Reading extracted MBR from %s"
-msgstr "读取从 %s 提取的 MBR"
+msgstr "正在读取从 %s 提取的 MBR"
 
 #: ../tails_installer/creator.py:1283
 #, python-format
@@ -358,7 +359,7 @@ msgstr "找不到适合安装 Tails 的设备"
 #: ../tails_installer/gui.py:518
 #, python-format
 msgid "Please plug a USB flash drive or SD card of at least %0.1f GB."
-msgstr "请插入容量大小至少为 %0.1f GB 的 U 盘或 SD 卡。"
+msgstr "请插入容量 %0.1f GB 以上的的 U 盘或 SD 卡。"
 
 #: ../tails_installer/gui.py:552
 #, python-format
@@ -366,7 +367,7 @@ msgid ""
 "The USB stick \"%(pretty_name)s\" is configured as non-removable by its "
 "manufacturer and Tails will fail to start on it. Please try installing on a "
 "different model."
-msgstr "æ­¤USB移动存储设备\"%(pretty_name)s\"被生产厂商é…
ç½®ä¸ºéžå¯ç§»åŠ¨ç£ç›˜ï¼ŒTail无法在其上启动。请尝试在å…
¶ä»–移动存储设备上安装。"
+msgstr "æ­¤USB移动存储设备\"%(pretty_name)s\"被生产厂商é…
ç½®ä¸ºä¸å¯ç§»åŠ¨ç£ç›˜ï¼ŒTail无法从其上启动。请尝试在å…
¶ä»–移动存储设备上安装。"
 
 #: ../tails_installer/gui.py:562
 #, python-format
@@ -482,7 +483,7 @@ msgstr "“%s” 不存在"
 #: ../tails_installer/source.py:65
 #, python-format
 msgid "'%s' is not a directory"
-msgstr "“%s” 不是目录"
+msgstr "“%s” 不是一个文件夹"
 
 #: ../tails_installer/source.py:75
 #, python-format
@@ -498,7 +499,7 @@ msgstr "执行 %s 时发生错误。%s%s"
 
 #: ../tails_installer/utils.py:124
 msgid "Could not open device for writing."
-msgstr "无法打开设备的写入模式。"
+msgstr "无法向设备中写入数据。"
 
 #: ../data/tails-installer.ui.h:1
 msgid "Installation Instructions"

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update Makefile for tor compression options

2017-10-24 Thread n8fr8 
commit 90975fb18a61df16b2ee8cf39d40d3fa9455db16
Author: n8fr8 
Date:   Fri Oct 20 00:14:57 2017 -0400

update Makefile for tor compression options
---
 external/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/external/Makefile b/external/Makefile
index 4d716e89..2e8c29fd 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -207,7 +207,8 @@ tor/Makefile: tor/configure
--disable-asciidoc \
--enable-static-libevent 
--with-libevent-dir=$(EXTERNAL_ROOT) \
--enable-static-openssl 
--with-openssl-dir=$(EXTERNAL_ROOT) \
-   --disable-linker-hardening 
--disable-gcc-hardening --disable-tool-name-check
+   --disable-linker-hardening 
--disable-gcc-hardening --disable-tool-name-check \
+   --disable-lzma --enable-zstd
 
 tor-build-stamp: tor/Makefile
$(MAKE) -C tor all-am



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update tor constants to 0.3.1.7-openssl1.0.2k

2017-10-24 Thread n8fr8 
commit e6003f670f42a0a59d21b53bd407706c1f2737c1
Author: n8fr8 
Date:   Fri Oct 20 00:21:33 2017 -0400

update tor constants to 0.3.1.7-openssl1.0.2k
---
 .../main/java/org/torproject/android/service/TorServiceConstants.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
 
b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
index 5d87fec2..32bd9045 100644
--- 
a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
+++ 
b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java
@@ -135,7 +135,7 @@ public interface TorServiceConstants {
 public static final String CMD_UPDATE_TRANS_PROXY = "update";
 public static final String CMD_SET_EXIT = "setexit";
 
-public static final String BINARY_TOR_VERSION = "0.3.0.8-openssl1.0.2k-1";
+public static final String BINARY_TOR_VERSION = "0.3.1.7-openssl1.0.2k";
 public static final String PREF_BINARY_TOR_VERSION_INSTALLED = 
"BINARY_TOR_VERSION_INSTALLED";
 
 //obfsproxy 
@@ -155,4 +155,6 @@ public interface TorServiceConstants {
 
public static final String HIDDEN_SERVICES_DIR = "hidden_services";
 
+
+
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] remove unused permission

2017-10-24 Thread n8fr8 
commit f09508def5774f15ade4c30a6652a1437f2d613e
Author: n8fr8 
Date:   Tue Oct 24 22:16:01 2017 -0400

remove unused permission
---
 app/src/fullperm/AndroidManifest.xml | 9 +
 app/src/main/AndroidManifest.xml | 8 
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/src/fullperm/AndroidManifest.xml 
b/app/src/fullperm/AndroidManifest.xml
index 4389408c..dadd11c8 100644
--- a/app/src/fullperm/AndroidManifest.xml
+++ b/app/src/fullperm/AndroidManifest.xml
@@ -6,14 +6,7 @@
 
-
+
 
 
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8369083f..94c33920 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,14 +3,6 @@
 package="org.torproject.android"
 android:installLocation="auto">
 
-
 
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update main activity to clean up intents

2017-10-24 Thread n8fr8 
commit 1e2074c818673ef8eccf0017984fdcb16d6ea82e
Author: n8fr8 
Date:   Mon Oct 16 23:37:15 2017 -0400

update main activity to clean up intents
---
 .../java/org/torproject/android/OrbotMainActivity.java  | 17 +
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 013c9b43..afeab503 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -543,6 +543,7 @@ public class OrbotMainActivity extends AppCompatActivity
 try
 {
 String aboutText = readFromAssets(this,"LICENSE");
+aboutText = aboutText.replace("\n","");
 aboutOther.setText(Html.fromHtml(aboutText));
 }
 catch (Exception e){}
@@ -747,7 +748,6 @@ public class OrbotMainActivity extends AppCompatActivity
 // Get intent, action and MIME type
 Intent intent = getIntent();
 String action = intent.getAction();
-Log.d(TAG, "handleIntents " + action);
 
 if (action == null)
 return;
@@ -797,21 +797,6 @@ public class OrbotMainActivity extends AppCompatActivity
 
 startTor();
 
-//never allow backgrounds start from this type of intent start
-//app devs who want background starts, can use the service 
intents
-/**
- if (Prefs.allowBackgroundStarts())
- {
- Intent resultIntent;
- if (lastStatusIntent == null) {
- resultIntent = new Intent(intent);
- } else {
- resultIntent = lastStatusIntent;
- }
- resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, 
torStatus);
- setResult(RESULT_OK, resultIntent);
- finish();
- }*/
 
 break;
 case Intent.ACTION_VIEW:



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] remove xtables and iptables (no more root support)

2017-10-24 Thread n8fr8 
commit 25425a622ee96a2300504c78e3af35f72747f49d
Author: n8fr8 
Date:   Tue Oct 17 10:07:54 2017 -0400

remove xtables and iptables (no more root support)
---
 external/Makefile | 44 ++--
 1 file changed, 2 insertions(+), 42 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index 86e20d6b..4d716e89 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -92,7 +92,6 @@ endif
assets assets-clean \
openssl-static openssl-static-clean \
libevent libevent-clean \
-   iptables iptables-clean \
tor tor-clean \
polipo polipo-clean
 
@@ -185,42 +184,6 @@ libevent-clean:
git clean -fdx
 
 
#--#
-# iptables
-
-iptables/Makefile:
-   cp iptables-patch-1 iptables
-   cp iptables-patch-2 iptables
-   cp iptables-patch-3 iptables
-   cp iptables-patch-4 iptables
-   -cd iptables && \
-   patch -N -p1 --reject-file=- < iptables-patch-1
-   -cd iptables && \
-   patch -N -p1 --reject-file=- < iptables-patch-2
-   -cd iptables && \
-   patch -N -p1 --reject-file=- < iptables-patch-3
-   -cd iptables && \
-   patch -N -p0 --reject-file=- < iptables-patch-4
-   cd iptables && ./autogen.sh
-   cp config.sub iptables
-   cp config.guess iptables
-   cd iptables && \
-   CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) 
-I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \
-   ./configure --host=$(HOST) --disable-shared 
--enable-static 
-
-iptables-build-stamp: iptables/Makefile
-   $(MAKE) -C iptables 
-   touch iptables-build-stamp
-   cp iptables/iptables/xtables-multi bin/xtables
-
-iptables: iptables-build-stamp
-
-iptables-clean:
-   -rm -f iptables-build-stamp
-   -rm bin/xtables
-   -cd iptables && \
-   git clean -fdx
-
-#--#
 # tor
 
 tor/configure: 
@@ -302,14 +265,12 @@ pluto-clean:
 #in order to stop Android OS (older devices) from trying to 
compress/decompress it
 #this is related to a bug in compression of assets and resources > 1MB
 
-assets: tor polipo iptables pluto
+assets: tor polipo pluto
install -d ../orbotservice/src/main/assets/$(APP_ABI)
-$(STRIP) bin/polipo
-zip ../orbotservice/src/main/assets/$(APP_ABI)/polipo.mp3 bin/polipo
-$(STRIP) bin/tor
-zip ../orbotservice/src/main/assets/$(APP_ABI)/tor.mp3 bin/tor
-   -$(STRIP) bin/xtables
-   -zip ../orbotservice/src/main/assets/$(APP_ABI)/xtables.mp3 bin/xtables
-$(STRIP) bin/obfs4proxy
-zip ../orbotservice/src/main/assets/$(APP_ABI)/obfs4proxy.mp3 
bin/obfs4proxy
-$(STRIP) ../orbotservice/src/main/libs/$(APP_ABI)/pdnsd
@@ -319,7 +280,6 @@ assets: tor polipo iptables pluto
 assets-clean:
-rm ../orbotservice/src/main/assets/$(APP_ABI)/polipo.mp3
-rm ../orbotservice/src/main/assets/$(APP_ABI)/tor.mp3
-   -rm ../orbotservice/src/main/assets/$(APP_ABI)/xtables.mp3
-rm ../orbotservice/src/main/assets/$(APP_ABI)/obfs4proxy.mp3
-rm ../orbotservice/src/main/assets/$(APP_ABI)/pdnsd.mp3
 
@@ -328,7 +288,7 @@ assets-clean:
 # cleanup, cleanup, put the toys away
 
 ##clean: openssl-clean libevent-clean tor-clean polipo-clean assets-clean
-clean: openssl-clean libevent-clean tor-clean polipo-clean iptables-clean 
pluto-clean
+clean: openssl-clean libevent-clean tor-clean polipo-clean pluto-clean
 
 
#--#
 # debugging stuff



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update version to 15.4.4-BETA-1

2017-10-24 Thread n8fr8 
commit d86ace63da4a990dc3e8201b25cb565120f31cb1
Author: n8fr8 
Date:   Fri Oct 20 00:15:24 2017 -0400

update version to 15.4.4-BETA-1
update gradle depends
---
 app/build.gradle | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dd90ed24..96cf0fdf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,22 +26,22 @@ android {
 applicationId 'org.torproject.android'
 targetSdkVersion 23
 maxSdkVersion 23
-versionCode 1543
-versionName '15.4.3-RC-1-multi-SDK16'
+versionCode 1544
+versionName '15.4.4-BETA-1-multi-SDK16'
 }
 fullperm {
 minSdkVersion 23
 applicationId 'org.torproject.android'
 targetSdkVersion 25
-versionCode 15430001
-versionName '15.4.3-RC-1-multi-SDK23'
+versionCode 15440001
+versionName '15.4.3-BETA-1-multi-SDK23'
 }
 }
 }
 
 dependencies {
 compile project(':orbotservice')
-compile 'com.android.support:support-v4:25.0.0'
-compile 'com.android.support:appcompat-v7:25.0.0'
-compile 'com.android.support:design:25.0.0'
+compile 'com.android.support:support-v4:25.3.1'
+compile 'com.android.support:appcompat-v7:25.3.1'
+compile 'com.android.support:design:25.3.1'
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update to latest meek amazon bridge:

2017-10-24 Thread n8fr8 
commit 2bd5614210ac37e1316e3dfaec3cc215abc98b9a
Author: n8fr8 
Date:   Mon Oct 16 23:35:41 2017 -0400

update to latest meek amazon bridge:
https://trac.torproject.org/projects/tor/ticket/21918
---
 orbotservice/src/main/assets/bridges.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/orbotservice/src/main/assets/bridges.txt 
b/orbotservice/src/main/assets/bridges.txt
index bb194a30..fc831667 100644
--- a/orbotservice/src/main/assets/bridges.txt
+++ b/orbotservice/src/main/assets/bridges.txt
@@ -18,5 +18,5 @@ obfs4 154.35.22.12:4304 
00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXX
 obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D 
cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA 
iat-mode=0
 obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 
cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ 
iat-mode=1
 obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A 
cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA 
iat-mode=0
-meek_lite 0.0.2.0:1 B9E7141C594AF25699E0079C1F0146F409495296 
url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com
-meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE 
url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com
\ No newline at end of file
+meek_lite 0.0.2.0:1 B9E7141C594AF25699E0079C1F0146F409495296 
url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com
+meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE 
url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] make sure receiver unregisters when destroyed

2017-10-24 Thread n8fr8 
commit b322e530da659d714dc28679b158c3ed8fee8d7b
Author: n8fr8 
Date:   Mon Oct 16 23:36:14 2017 -0400

make sure receiver unregisters when destroyed
---
 .../java/org/torproject/android/service/TorService.java  | 16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git 
a/orbotservice/src/main/java/org/torproject/android/service/TorService.java 
b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index 597e59e2..36c1b229 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -428,6 +428,14 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 @Override
 public void onDestroy() {
 
+try {
+unregisterReceiver(mNetworkStateReceiver);
+}
+catch (IllegalArgumentException iae)
+{
+//not registered yet
+}
+
 stopTor();
 
 /**
@@ -476,13 +484,7 @@ public class TorService extends Service implements 
TorServiceConstants, OrbotCon
 clearNotifications();
 sendCallbackStatus(STATUS_OFF);
 
-try {
-unregisterReceiver(mNetworkStateReceiver);
-}
-catch (IllegalArgumentException iae)
-{
-//not registered yet
-}
+
 }
 
 private void killAllDaemons() throws Exception {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] simplify bridge selection screen

2017-10-24 Thread n8fr8 
commit b98a0ff160d55d5f218031aa501d109d238b188c
Author: n8fr8 
Date:   Mon Oct 16 23:48:45 2017 -0400

simplify bridge selection screen
---
 app/src/main/java/org/torproject/android/OrbotMainActivity.java | 7 +--
 app/src/main/res/values-es/arrays.xml   | 3 +--
 app/src/main/res/values/arrays.xml  | 7 +++
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java 
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index afeab503..354b4a05 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -1040,12 +1040,7 @@ public class OrbotMainActivity extends AppCompatActivity
   enableBridges(true);
 
   break;
-  case 1: //azure
-  Prefs.setBridgesList("meek");
-  enableBridges(true);
-  
-  break;
-  case 2: //amazon
+  case 2: //amazon & azure
Prefs.setBridgesList("meek");
   enableBridges(true);
   
diff --git a/app/src/main/res/values-es/arrays.xml 
b/app/src/main/res/values-es/arrays.xml
index f521c318..feb0062d 100644
--- a/app/src/main/res/values-es/arrays.xml
+++ b/app/src/main/res/values-es/arrays.xml
@@ -4,8 +4,7 @@
 

Obfs4 (Preferido)
-   Túnel a través de Azure
-   Túnel a través de Amazon
+   Túnel a través de Azure y Amazon
Obtener nuevos puentes


diff --git a/app/src/main/res/values/arrays.xml 
b/app/src/main/res/values/arrays.xml
index d0f22015..9e7a6196 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -3,10 +3,9 @@
 
 

-   Obfs4 (Best)
-   Tunnel through Azure
-   Tunnel through Amazon
-   Get New Bridges
+   Default Bridges (Obfs4)
+   Cloud Tunneling (Meek)
+   Get New Bridges...






___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update about layout to show obfs4proxy

2017-10-24 Thread n8fr8 
commit a5015dc691cfe4a07c4f583ab4bb439d8ce2ec05
Author: n8fr8 
Date:   Mon Oct 16 23:36:47 2017 -0400

update about layout to show obfs4proxy
---
 app/src/main/res/layout/layout_about.xml | 2 +-
 app/src/main/res/values/strings.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/layout_about.xml 
b/app/src/main/res/layout/layout_about.xml
index 4ac8a431..45482053 100644
--- a/app/src/main/res/layout/layout_about.xml
+++ b/app/src/main/res/layout/layout_about.xml
@@ -82,7 +82,7 @@
android:textColorLink="#ff"
android:paddingLeft="15px"  
android:textColor="#ff" />  
-   Tor: https://www.torproject.org
   LibEvent v2.0.21: 
http://www.monkey.org/~provos/libevent/
   Polipo v1.1.9: 
https://github.com/jech/polipo
-  IPtables v1.4.21: 
http://www.netfilter.org
+  Obfs4proxy v0.0.8: 
https://github.com/Yawning/obfs4
   OpenSSL v1.0.2j: 
http://www.openssl.org
   An app wants to open hidden server 
port %1$s to the Tor network. This is safe if you trust the app.
   found existing Tor 
process



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] tor-0.3.1.7 update

2017-10-24 Thread n8fr8 
commit b0b6b68c841b416bec84c6a000ffe2cda13f9735
Author: n8fr8 
Date:   Tue Oct 17 09:59:18 2017 -0400

tor-0.3.1.7 update
---
 external/tor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/tor b/external/tor
index 802d30d9..6babd3d9 16
--- a/external/tor
+++ b/external/tor
@@ -1 +1 @@
-Subproject commit 802d30d9b71a6d54ef5fd1278ab4858b2e76e750
+Subproject commit 6babd3d9ba9318b38b5af7278875efe84055a1b0



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [orbot/master] update version 15430000 aka 15.4.3-RC-1-multi-SDK16

2017-10-24 Thread n8fr8 
commit dceea1178231b1136693b0de69fdb1c3f46c6a64
Author: n8fr8 
Date:   Mon Oct 16 23:49:03 2017 -0400

update version 1543 aka 15.4.3-RC-1-multi-SDK16
---
 app/build.gradle | 13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b7f031a4..dd90ed24 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -26,20 +26,15 @@ android {
 applicationId 'org.torproject.android'
 targetSdkVersion 23
 maxSdkVersion 23
-versionCode 1542
-versionName '15.4.2-RC-1-multi-SDK16'
+versionCode 1543
+versionName '15.4.3-RC-1-multi-SDK16'
 }
 fullperm {
 minSdkVersion 23
 applicationId 'org.torproject.android'
 targetSdkVersion 25
-versionCode 15420001
-versionName '15.4.2-RC-1-multi-SDK23'
-}
-orbotgo {
-minSdkVersion 16
-applicationId 'org.torproject.android.go'
-targetSdkVersion 25
+versionCode 15430001
+versionName '15.4.3-RC-1-multi-SDK23'
 }
 }
 }



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-10-24 Thread nickm 
commit e5c341eb7c1189985d903f708ce91516da7f0c76
Merge: 349818380 e7126a103
Author: Nick Mathewson 
Date:   Tue Oct 24 19:43:13 2017 -0400

Merge branch 'maint-0.3.2'

 changes/bug20532 | 4 
 src/or/bridges.c | 8 
 2 files changed, 12 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Rewrite bridge addresses earlier

2017-10-24 Thread nickm 
commit 9b60acd4d4ee451fd961b1f03ae46eee960c72ee
Author: Taylor Yu 
Date:   Thu Sep 28 17:15:47 2017 -0500

Rewrite bridge addresses earlier

Call rewrite_node_address_for_bridge() in
launch_direct_bridge_descriptor_fetch() in case there's an existing
node_t for it.
---
 changes/bug20532 | 4 
 src/or/bridges.c | 8 
 2 files changed, 12 insertions(+)

diff --git a/changes/bug20532 b/changes/bug20532
new file mode 100644
index 0..7c190ea03
--- /dev/null
+++ b/changes/bug20532
@@ -0,0 +1,4 @@
+  o Minor bugfixes (bridges):
+- Overwrite the bridge address earlier in the process of directly
+  retrieving its descriptor, to make sure we reach it on the configured
+  address.  Fixes bug 20532; bugfix on 0.2.0.10-alpha.
diff --git a/src/or/bridges.c b/src/or/bridges.c
index 0818fb081..0bcc3eeb4 100644
--- a/src/or/bridges.c
+++ b/src/or/bridges.c
@@ -54,6 +54,8 @@ struct bridge_info_t {
 };
 
 static void bridge_free(bridge_info_t *bridge);
+static void rewrite_node_address_for_bridge(const bridge_info_t *bridge,
+node_t *node);
 
 /** A list of configured bridges. Whenever we actually get a descriptor
  * for one, we add it as an entry guard.  Note that the order of bridges
@@ -571,6 +573,12 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t 
*bridge)
 return;
   }
 
+  /* If we already have a node_t for this bridge, rewrite its address now. */
+  node_t *node = node_get_mutable_by_id(bridge->identity);
+  if (node) {
+rewrite_node_address_for_bridge(bridge, node);
+  }
+
   tor_addr_port_t bridge_addrport;
   memcpy(_addrport.addr, >addr, sizeof(tor_addr_t));
   bridge_addrport.port = bridge->port;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Rewrite bridge addresses earlier

2017-10-24 Thread nickm 
commit 9b60acd4d4ee451fd961b1f03ae46eee960c72ee
Author: Taylor Yu 
Date:   Thu Sep 28 17:15:47 2017 -0500

Rewrite bridge addresses earlier

Call rewrite_node_address_for_bridge() in
launch_direct_bridge_descriptor_fetch() in case there's an existing
node_t for it.
---
 changes/bug20532 | 4 
 src/or/bridges.c | 8 
 2 files changed, 12 insertions(+)

diff --git a/changes/bug20532 b/changes/bug20532
new file mode 100644
index 0..7c190ea03
--- /dev/null
+++ b/changes/bug20532
@@ -0,0 +1,4 @@
+  o Minor bugfixes (bridges):
+- Overwrite the bridge address earlier in the process of directly
+  retrieving its descriptor, to make sure we reach it on the configured
+  address.  Fixes bug 20532; bugfix on 0.2.0.10-alpha.
diff --git a/src/or/bridges.c b/src/or/bridges.c
index 0818fb081..0bcc3eeb4 100644
--- a/src/or/bridges.c
+++ b/src/or/bridges.c
@@ -54,6 +54,8 @@ struct bridge_info_t {
 };
 
 static void bridge_free(bridge_info_t *bridge);
+static void rewrite_node_address_for_bridge(const bridge_info_t *bridge,
+node_t *node);
 
 /** A list of configured bridges. Whenever we actually get a descriptor
  * for one, we add it as an entry guard.  Note that the order of bridges
@@ -571,6 +573,12 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t 
*bridge)
 return;
   }
 
+  /* If we already have a node_t for this bridge, rewrite its address now. */
+  node_t *node = node_get_mutable_by_id(bridge->identity);
+  if (node) {
+rewrite_node_address_for_bridge(bridge, node);
+  }
+
   tor_addr_port_t bridge_addrport;
   memcpy(_addrport.addr, >addr, sizeof(tor_addr_t));
   bridge_addrport.port = bridge->port;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2

2017-10-24 Thread nickm 
commit e7126a1030233fd656cff4a8ee998026065fb65b
Merge: b95ef19a7 9b60acd4d
Author: Nick Mathewson 
Date:   Tue Oct 24 19:41:26 2017 -0400

Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into 
maint-0.3.2

 changes/bug20532 | 4 
 src/or/bridges.c | 8 
 2 files changed, 12 insertions(+)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Turn a comment into a doxygen comment.

2017-10-24 Thread nickm 
commit 3498183807fa626289aab98ed8b2477176a70190
Author: Nick Mathewson 
Date:   Tue Oct 24 19:42:18 2017 -0400

Turn a comment into a doxygen comment.

Crediting this * to teor, in penance for mis-crediting his x removal
to Isis.  The balance is restored.
---
 src/or/or.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/or/or.h b/src/or/or.h
index 26f00b718..d1746d9a6 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2245,7 +2245,7 @@ typedef struct {
  * a purpose we didn't recognize. */
 #define ROUTER_PURPOSE_UNKNOWN 255
 
-  /* In what way did we find out about this router?  One of ROUTER_PURPOSE_*.
+  /** In what way did we find out about this router?  One of ROUTER_PURPOSE_*.
* Routers of different purposes are kept segregated and used for different
* things; see notes on ROUTER_PURPOSE_* macros above.
*/



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Rewrite bridge addresses earlier

2017-10-24 Thread nickm 
commit 9b60acd4d4ee451fd961b1f03ae46eee960c72ee
Author: Taylor Yu 
Date:   Thu Sep 28 17:15:47 2017 -0500

Rewrite bridge addresses earlier

Call rewrite_node_address_for_bridge() in
launch_direct_bridge_descriptor_fetch() in case there's an existing
node_t for it.
---
 changes/bug20532 | 4 
 src/or/bridges.c | 8 
 2 files changed, 12 insertions(+)

diff --git a/changes/bug20532 b/changes/bug20532
new file mode 100644
index 0..7c190ea03
--- /dev/null
+++ b/changes/bug20532
@@ -0,0 +1,4 @@
+  o Minor bugfixes (bridges):
+- Overwrite the bridge address earlier in the process of directly
+  retrieving its descriptor, to make sure we reach it on the configured
+  address.  Fixes bug 20532; bugfix on 0.2.0.10-alpha.
diff --git a/src/or/bridges.c b/src/or/bridges.c
index 0818fb081..0bcc3eeb4 100644
--- a/src/or/bridges.c
+++ b/src/or/bridges.c
@@ -54,6 +54,8 @@ struct bridge_info_t {
 };
 
 static void bridge_free(bridge_info_t *bridge);
+static void rewrite_node_address_for_bridge(const bridge_info_t *bridge,
+node_t *node);
 
 /** A list of configured bridges. Whenever we actually get a descriptor
  * for one, we add it as an entry guard.  Note that the order of bridges
@@ -571,6 +573,12 @@ launch_direct_bridge_descriptor_fetch(bridge_info_t 
*bridge)
 return;
   }
 
+  /* If we already have a node_t for this bridge, rewrite its address now. */
+  node_t *node = node_get_mutable_by_id(bridge->identity);
+  if (node) {
+rewrite_node_address_for_bridge(bridge, node);
+  }
+
   tor_addr_port_t bridge_addrport;
   memcpy(_addrport.addr, >addr, sizeof(tor_addr_t));
   bridge_addrport.port = bridge->port;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2

2017-10-24 Thread nickm 
commit e7126a1030233fd656cff4a8ee998026065fb65b
Merge: b95ef19a7 9b60acd4d
Author: Nick Mathewson 
Date:   Tue Oct 24 19:41:26 2017 -0400

Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into 
maint-0.3.2

 changes/bug20532 | 4 
 src/or/bridges.c | 8 
 2 files changed, 12 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into maint-0.3.2

2017-10-24 Thread nickm 
commit e7126a1030233fd656cff4a8ee998026065fb65b
Merge: b95ef19a7 9b60acd4d
Author: Nick Mathewson 
Date:   Tue Oct 24 19:41:26 2017 -0400

Merge remote-tracking branch 'catalyst-oniongit/bug20532_031' into 
maint-0.3.2

 changes/bug20532 | 4 
 src/or/bridges.c | 8 
 2 files changed, 12 insertions(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'feature18329_029_squashed' into maint-0.3.2

2017-10-24 Thread nickm 
commit b95ef19a77e2e04c740bbbe16d3b0ed7a5239aee
Merge: 594cf9249 f3af74ccf
Author: Nick Mathewson 
Date:   Tue Oct 24 19:35:32 2017 -0400

Merge branch 'feature18329_029_squashed' into maint-0.3.2

 changes/feature18329   |  2 +-
 src/test/test_config.c | 18 +-
 src/test/test_router.c |  7 +--
 3 files changed, 19 insertions(+), 8 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Updates to fix check-spaces/check-changes warnings

2017-10-24 Thread nickm 
commit f3af74ccf594c07f7edbf0bdfa576b9af21563d9
Author: Nick Mathewson 
Date:   Tue Oct 24 19:35:16 2017 -0400

Updates to fix check-spaces/check-changes warnings
---
 changes/feature18329   |  2 +-
 src/or/config.c|  1 -
 src/test/test_config.c | 12 
 src/test/test_router.c |  7 +--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/changes/feature18329 b/changes/feature18329
index f534c7614..1dabf5024 100644
--- a/changes/feature18329
+++ b/changes/feature18329
@@ -1,4 +1,4 @@
-  o Minor features:
+  o Minor features (bridge):
 - Bridge relays can now set the BridgeDistribution config option to
   add a "bridge-distribution-request" line to their bridge descriptor,
   which tells BridgeDB how they'd like their bridge address to be
diff --git a/src/or/config.c b/src/or/config.c
index 0b1e6bed1..330e8dcdd 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3355,7 +3355,6 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 }
   }
 
-
   if (options->MinUptimeHidServDirectoryV2 < 0) {
 log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
 "least 0 seconds. Changing to 0.");
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 593d3ca8f..978a24b81 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -4893,7 +4893,8 @@ test_config_parse_port_config__ports__server_options(void 
*data)
 /* If we're not configured to be a bridge, but we set
  * BridgeDistribution, then options_validate () should return -1. */
 static void
-test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
+test_config_check_bridge_distribution_setting_not_a_bridge(void *arg)
+{
   or_options_t* options = get_options_mutable();
   or_options_t* old_options = options;
   or_options_t* default_options = options;
@@ -4914,7 +4915,8 @@ 
test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
 
 /* If the BridgeDistribution setting was valid, 0 should be returned. */
 static void
-test_config_check_bridge_distribution_setting_valid(void *arg) {
+test_config_check_bridge_distribution_setting_valid(void *arg)
+{
   int ret = check_bridge_distribution_setting("https");
 
   (void)arg;
@@ -4926,7 +4928,8 @@ test_config_check_bridge_distribution_setting_valid(void 
*arg) {
 
 /* If the BridgeDistribution setting was invalid, -1 should be returned. */
 static void
-test_config_check_bridge_distribution_setting_invalid(void *arg) {
+test_config_check_bridge_distribution_setting_invalid(void *arg)
+{
   int ret = check_bridge_distribution_setting("hyphens-are-allowed");
 
   (void)arg;
@@ -4943,7 +4946,8 @@ 
test_config_check_bridge_distribution_setting_invalid(void *arg) {
 /* If the BridgeDistribution setting was unrecognised, a warning should be
  * logged and 0 should be returned. */
 static void
-test_config_check_bridge_distribution_setting_unrecognised(void *arg) {
+test_config_check_bridge_distribution_setting_unrecognised(void *arg)
+{
   int ret = check_bridge_distribution_setting("unicorn");
 
   (void)arg;
diff --git a/src/test/test_router.c b/src/test/test_router.c
index 64434035e..4e96e2453 100644
--- a/src/test/test_router.c
+++ b/src/test/test_router.c
@@ -22,7 +22,8 @@ NS_DECL(const routerinfo_t *, router_get_my_routerinfo, 
(void));
 static routerinfo_t* mock_routerinfo;
 
 static const routerinfo_t*
-NS(router_get_my_routerinfo)(void) {
+NS(router_get_my_routerinfo)(void)
+{
   crypto_pk_t* ident_key;
   crypto_pk_t* tap_key;
   time_t now;
@@ -57,7 +58,8 @@ NS(router_get_my_routerinfo)(void) {
 /* If no distribution option was set, then check_bridge_distribution_setting()
  * should have set it to "any". */
 static void
-test_router_dump_router_to_string_no_bridge_distribution_method(void *arg) {
+test_router_dump_router_to_string_no_bridge_distribution_method(void *arg)
+{
   const char* needle = "bridge-distribution-request any";
   or_options_t* options = get_options_mutable();
   routerinfo_t* router = NULL;
@@ -107,3 +109,4 @@ struct testcase_t router_tests[] = {
   ROUTER_TEST(dump_router_to_string_no_bridge_distribution_method, TT_FORK),
   END_OF_TESTCASES
 };
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] doc: Improve documentation for check_bridge_distribution_setting().

2017-10-24 Thread nickm 
commit b0e10f23ba2b03f275ef4acf2183a02042e6cded
Author: Isis Lovecruft 
Date:   Mon Oct 23 19:37:52 2017 +

doc: Improve documentation for check_bridge_distribution_setting().
---
 src/or/config.c | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 7f45bb2cb..4d08a0795 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6350,8 +6350,26 @@ warn_client_dns_cache(const char *option, int disabling)
   "to your destination.");
 }
 
-/** Warn if bd is an unrecognized bridge distribution setting;
- * return -1 if it is invalid. */
+/**
+ * Validate the configured bridge distribution method from a BridgeDistribution
+ * config line.
+ *
+ * The input bd, is a string taken from the BridgeDistribution config
+ * line (if present).  If the option wasn't set, return 0 immediately.  The
+ * BridgeDistribution option is then validated.  Currently valid, recognised
+ * options are:
+ *
+ * - "none"
+ * - "any"
+ * - "https"
+ * - "email"
+ * - "moat"
+ * - "hyphae"
+ *
+ * If the option string is unrecognised, a warning will be logged and 0 is
+ * returned.  If the option string contains an invalid character, -1 is
+ * returned.
+ **/
 static int
 check_bridge_distribution_setting(const char *bd)
 {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'feature18329_029_squashed' into maint-0.3.2

2017-10-24 Thread nickm 
commit b95ef19a77e2e04c740bbbe16d3b0ed7a5239aee
Merge: 594cf9249 f3af74ccf
Author: Nick Mathewson 
Date:   Tue Oct 24 19:35:32 2017 -0400

Merge branch 'feature18329_029_squashed' into maint-0.3.2

 changes/feature18329   |  2 +-
 src/test/test_config.c | 18 +-
 src/test/test_router.c |  7 +--
 3 files changed, 19 insertions(+), 8 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Add new BridgeDistribution config option

2017-10-24 Thread nickm 
commit ebab5215252f9fa810ae091c335c5ae6e619faaf
Author: Roger Dingledine 
Date:   Sun Nov 13 02:39:16 2016 -0500

Add new BridgeDistribution config option

Bridge relays can use it to add a "bridge-distribution-request" line
to their bridge descriptor, which tells BridgeDB how they'd like their
bridge address to be given out.

Implements tickets 18329.
---
 changes/feature18329 | 6 ++
 doc/tor.1.txt| 6 ++
 src/or/config.c  | 7 +++
 src/or/or.h  | 4 
 src/or/router.c  | 8 
 5 files changed, 31 insertions(+)

diff --git a/changes/feature18329 b/changes/feature18329
new file mode 100644
index 0..7fdb659e8
--- /dev/null
+++ b/changes/feature18329
@@ -0,0 +1,6 @@
+  o Minor features:
+- Bridge relays can now set the BridgeDistribution config option to
+  add a "bridge-distribution-request" line to their bridge descriptor,
+  which tells BridgeDB how they'd like their bridge address to be
+  given out. Implements tickets 18329.
+
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index f1068cedc..7da5ba3fe 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1647,6 +1647,12 @@ is non-zero):
 server descriptor to the bridge database, rather than
 to the public directory authorities.
 
+[[BridgeDistribution]] **BridgeDistribution** __string__::
+If set along with BridgeRelay, Tor will include a new line in its
+bridge descriptor which indicates to the BridgeDB service how it
+would like its bridge address to be given out. Set it to "none" if
+you want BridgeDB to avoid distributing your bridge address.
+
 [[ContactInfo]] **ContactInfo** __email_address__::
 Administrative contact information for this relay or bridge. This line
 can be used to contact you if your relay or bridge is misconfigured or
diff --git a/src/or/config.c b/src/or/config.c
index 08cc5cdf5..1bdfdf484 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -182,6 +182,7 @@ static config_var_t option_vars_[] = {
   V(BridgePassword,  STRING,   NULL),
   V(BridgeRecordUsageByCountry,  BOOL, "1"),
   V(BridgeRelay, BOOL, "0"),
+  V(BridgeDistribution,  STRING,   NULL),
   V(CellStatistics,  BOOL, "0"),
   V(LearnCircuitBuildTimeout,BOOL, "1"),
   V(CircuitBuildTimeout, INTERVAL, "0"),
@@ -3346,6 +3347,10 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 options->DirPort_set = 0;
   }
 
+  if (options->BridgeDistribution && !options->BridgeRelay) {
+REJECT("You have set BridgeDistribution, yet you didn't set BridgeRelay!");
+  }
+
   if (options->MinUptimeHidServDirectoryV2 < 0) {
 log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
 "least 0 seconds. Changing to 0.");
@@ -4497,6 +4502,8 @@ options_transition_affects_descriptor(const or_options_t 
*old_options,
   get_effective_bwburst(old_options) !=
 get_effective_bwburst(new_options) ||
   !opt_streq(old_options->ContactInfo, new_options->ContactInfo) ||
+  !opt_streq(old_options->BridgeDistribution,
+ new_options->BridgeDistribution) ||
   !opt_streq(old_options->MyFamily, new_options->MyFamily) ||
   !opt_streq(old_options->AccountingStart, new_options->AccountingStart) ||
   old_options->AccountingMax != new_options->AccountingMax ||
diff --git a/src/or/or.h b/src/or/or.h
index 33fe8b96c..3d61cfa05 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3638,6 +3638,10 @@ typedef struct {
   int BridgeAuthoritativeDir; /**< Boolean: is this an authoritative directory
* that aggregates bridge descriptors? */
 
+  /** If set on a bridge relay, it will include this value on a new
+   * "bridge-distribution-request" line in its bridge descriptor. */
+  char *BridgeDistribution;
+
   /** If set on a bridge authority, it will answer requests on its dirport
* for bridge statuses -- but only if the requests use this password. */
   char *BridgePassword;
diff --git a/src/or/router.c b/src/or/router.c
index 6d3a32a60..780d0444f 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2867,6 +2867,14 @@ router_dump_router_to_string(routerinfo_t *router,
 smartlist_add_asprintf(chunks, "contact %s\n", ci);
   }
 
+  if (options->BridgeRelay && options->BridgeDistribution &&
+  strlen(options->BridgeDistribution)) {
+const char *bd = options->BridgeDistribution;
+if (strchr(bd, '\n') || strchr(bd, '\r'))
+  bd = escaped(bd);
+smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd);
+  }
+
   if (router->onion_curve25519_pkey) {
 char kbuf[128];
 base64_encode(kbuf, sizeof(kbuf),



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Adjust test to allow hyphens too.

2017-10-24 Thread nickm 
commit 44e8aaa9aa57bf6b9fce1712a8f77e5f9979392c
Author: Nick Mathewson 
Date:   Tue Oct 24 19:33:38 2017 -0400

Adjust test to allow hyphens too.
---
 src/test/test_config.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 396f06adf..593d3ca8f 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -4927,10 +4927,14 @@ 
test_config_check_bridge_distribution_setting_valid(void *arg) {
 /* If the BridgeDistribution setting was invalid, -1 should be returned. */
 static void
 test_config_check_bridge_distribution_setting_invalid(void *arg) {
-  int ret = check_bridge_distribution_setting("hyphens-are-not-allowed");
+  int ret = check_bridge_distribution_setting("hyphens-are-allowed");
 
   (void)arg;
 
+  tt_int_op(ret, OP_EQ, 0);
+
+  ret = check_bridge_distribution_setting("asterisks*are*forbidden");
+
   tt_int_op(ret, OP_EQ, -1);
  done:
   return;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Adjust test to allow hyphens too.

2017-10-24 Thread nickm 
commit 44e8aaa9aa57bf6b9fce1712a8f77e5f9979392c
Author: Nick Mathewson 
Date:   Tue Oct 24 19:33:38 2017 -0400

Adjust test to allow hyphens too.
---
 src/test/test_config.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 396f06adf..593d3ca8f 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -4927,10 +4927,14 @@ 
test_config_check_bridge_distribution_setting_valid(void *arg) {
 /* If the BridgeDistribution setting was invalid, -1 should be returned. */
 static void
 test_config_check_bridge_distribution_setting_invalid(void *arg) {
-  int ret = check_bridge_distribution_setting("hyphens-are-not-allowed");
+  int ret = check_bridge_distribution_setting("hyphens-are-allowed");
 
   (void)arg;
 
+  tt_int_op(ret, OP_EQ, 0);
+
+  ret = check_bridge_distribution_setting("asterisks*are*forbidden");
+
   tt_int_op(ret, OP_EQ, -1);
  done:
   return;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Always set bridge-distribution-request on bridges' descriptors.

2017-10-24 Thread nickm 
commit 613b18f0afd865b0fc5daf8d17da241396100dcd
Author: Nick Mathewson 
Date:   Mon Oct 23 10:52:42 2017 -0400

Always set bridge-distribution-request on bridges' descriptors.

Also, warn the user if the BridgeDistribution option is
unrecognized, and reject the value if it is invalid.
---
 src/or/config.c | 43 ---
 src/or/router.c | 10 +++---
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 1bdfdf484..7f45bb2cb 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -654,7 +654,7 @@ static int parse_ports(or_options_t *options, int 
validate_only,
 static int check_server_ports(const smartlist_t *ports,
   const or_options_t *options,
   int *num_low_ports_out);
-
+static int check_bridge_distribution_setting(const char *bd);
 static int validate_data_directory(or_options_t *options);
 static int write_configuration_file(const char *fname,
 const or_options_t *options);
@@ -3347,10 +3347,16 @@ options_validate(or_options_t *old_options, 
or_options_t *options,
 options->DirPort_set = 0;
   }
 
-  if (options->BridgeDistribution && !options->BridgeRelay) {
-REJECT("You have set BridgeDistribution, yet you didn't set BridgeRelay!");
+  if (options->BridgeDistribution) {
+if (!options->BridgeRelay) {
+  REJECT("You set BridgeDistribution, but you didn't set BridgeRelay!");
+}
+if (check_bridge_distribution_setting(options->BridgeDistribution) < 0) {
+  REJECT("Invalid BridgeDistribution value.");
+}
   }
 
+
   if (options->MinUptimeHidServDirectoryV2 < 0) {
 log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
 "least 0 seconds. Changing to 0.");
@@ -6344,6 +6350,37 @@ warn_client_dns_cache(const char *option, int disabling)
   "to your destination.");
 }
 
+/** Warn if bd is an unrecognized bridge distribution setting;
+ * return -1 if it is invalid. */
+static int
+check_bridge_distribution_setting(const char *bd)
+{
+  if (bd == NULL)
+return 0;
+
+  const char *RECOGNIZED[] = {
+"none", "any", "https", "email", "moat", "hyphae"
+  };
+  unsigned i;
+  for (i = 0; i < ARRAY_LENGTH(RECOGNIZED); ++i) {
+if (!strcmp(bd, RECOGNIZED[i]))
+  return 0;
+  }
+
+  const char *cp = bd;
+  //  Method = (KeywordChar | "_") +
+  while (TOR_ISALNUM(*cp) || *cp == '-' || *cp == '_')
+++cp;
+
+  if (*cp == 0) {
+log_warn(LD_CONFIG, "Unrecognized BridgeDistribution value %s. I'll "
+   "assume you know what you are doing...", escaped(bd));
+return 0; // we reached the end of the string; all is well
+  } else {
+return -1; // we found a bad character in the string.
+  }
+}
+
 /**
  * Parse port configuration for a single port type.
  *
diff --git a/src/or/router.c b/src/or/router.c
index 780d0444f..553264efa 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2867,9 +2867,13 @@ router_dump_router_to_string(routerinfo_t *router,
 smartlist_add_asprintf(chunks, "contact %s\n", ci);
   }
 
-  if (options->BridgeRelay && options->BridgeDistribution &&
-  strlen(options->BridgeDistribution)) {
-const char *bd = options->BridgeDistribution;
+  if (options->BridgeRelay) {
+const char *bd;
+if (options->BridgeDistribution && strlen(options->BridgeDistribution)) {
+  bd = options->BridgeDistribution;
+} else {
+  bd = "any";
+}
 if (strchr(bd, '\n') || strchr(bd, '\r'))
   bd = escaped(bd);
 smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Tweak the documentation for BridgeDistribution

2017-10-24 Thread nickm 
commit 3581f93d273dfd9fbc56de907b7e3b77575614e1
Author: Nick Mathewson 
Date:   Mon Oct 23 10:38:19 2017 -0400

Tweak the documentation for BridgeDistribution

Note that it will have no effect yet; note that the default is
"any".
---
 changes/feature18329 | 5 -
 doc/tor.1.txt| 7 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/changes/feature18329 b/changes/feature18329
index 7fdb659e8..f534c7614 100644
--- a/changes/feature18329
+++ b/changes/feature18329
@@ -2,5 +2,8 @@
 - Bridge relays can now set the BridgeDistribution config option to
   add a "bridge-distribution-request" line to their bridge descriptor,
   which tells BridgeDB how they'd like their bridge address to be
-  given out. Implements tickets 18329.
+  given out. (Note that as of Oct 2017, BridgeDB does not yet implement
+  this feature.) As a side benefit, this feature provides a way
+  to distinguish bridge descriptors from non-bridge descriptors.
+  Implements tickets 18329.
 
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 7da5ba3fe..52e81860b 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1651,7 +1651,12 @@ is non-zero):
 If set along with BridgeRelay, Tor will include a new line in its
 bridge descriptor which indicates to the BridgeDB service how it
 would like its bridge address to be given out. Set it to "none" if
-you want BridgeDB to avoid distributing your bridge address.
+you want BridgeDB to avoid distributing your bridge address, or "any" to
+let BridgeDB decide. (Default: any)
+ +
+Note: as of Oct 2017, the BridgeDB part of this option is not yet
+implemented.  Until BridgeDB is updated to obey this option, your
+bridge will make this request, but it will not (yet) be obeyed.
 
 [[ContactInfo]] **ContactInfo** __email_address__::
 Administrative contact information for this relay or bridge. This line



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'feature18329_029_squashed' into maint-0.3.2

2017-10-24 Thread nickm 
commit 594cf92498c8ea12dc0b19f743d6b88d4a98f1eb
Merge: 122a7f884 02cde0d93
Author: Nick Mathewson 
Date:   Tue Oct 24 19:35:28 2017 -0400

Merge branch 'feature18329_029_squashed' into maint-0.3.2

 changes/feature18329   |   9 
 doc/tor.1.txt  |  11 +
 src/or/config.c|  62 +++-
 src/or/config.h|   2 +
 src/or/or.h|   4 ++
 src/or/router.c|  12 ++
 src/test/include.am|   1 +
 src/test/test.c|   1 +
 src/test/test_config.c |  63 
 src/test/test_router.c | 109 +
 10 files changed, 273 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index a2353b94d,0b1e6bed1..b123d4935
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -253,15 -182,14 +253,16 @@@ static config_var_t option_vars_[] = 
V(BridgePassword,  STRING,   NULL),
V(BridgeRecordUsageByCountry,  BOOL, "1"),
V(BridgeRelay, BOOL, "0"),
+   V(BridgeDistribution,  STRING,   NULL),
V(CellStatistics,  BOOL, "0"),
 +  V(PaddingStatistics,   BOOL, "1"),
V(LearnCircuitBuildTimeout,BOOL, "1"),
V(CircuitBuildTimeout, INTERVAL, "0"),
 -  V(CircuitIdleTimeout,  INTERVAL, "1 hour"),
 +  OBSOLETE("CircuitIdleTimeout"),
 +  V(CircuitsAvailableTimeout,INTERVAL, "0"),
V(CircuitStreamTimeout,INTERVAL, "0"),
V(CircuitPriorityHalflife, DOUBLE,  "-100.0"), /*negative:'Use 
default'*/
 -  V(ClientDNSRejectInternalAddresses, BOOL,"1"),
 +  V(TestingClientDNSRejectInternalAddresses, BOOL,"1"),
V(ClientOnly,  BOOL, "0"),
V(ClientPreferIPv6ORPort,  AUTOBOOL, "auto"),
V(ClientPreferIPv6DirPort, AUTOBOOL, "auto"),
@@@ -3504,14 -3346,16 +3504,23 @@@ options_validate(or_options_t *old_opti
  options->DirPort_set = 0;
}
  
 +  if (server_mode(options) && options->ConnectionPadding != -1) {
 +REJECT("Relays must use 'auto' for the ConnectionPadding setting.");
 +  }
 +
 +  if (server_mode(options) && options->ReducedConnectionPadding != 0) {
 +REJECT("Relays cannot set ReducedConnectionPadding. ");
 +  }
 +
+   if (options->BridgeDistribution) {
+ if (!options->BridgeRelay) {
+   REJECT("You set BridgeDistribution, but you didn't set BridgeRelay!");
+ }
+ if (check_bridge_distribution_setting(options->BridgeDistribution) < 0) {
+   REJECT("Invalid BridgeDistribution value.");
+ }
+   }
+ 
 -
if (options->MinUptimeHidServDirectoryV2 < 0) {
  log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
  "least 0 seconds. Changing to 0.");
@@@ -4686,7 -4507,9 +4695,9 @@@ options_transition_affects_descriptor(c
get_effective_bwburst(old_options) !=
  get_effective_bwburst(new_options) ||
!opt_streq(old_options->ContactInfo, new_options->ContactInfo) ||
+   !opt_streq(old_options->BridgeDistribution,
+  new_options->BridgeDistribution) ||
 -  !opt_streq(old_options->MyFamily, new_options->MyFamily) ||
 +  !config_lines_eq(old_options->MyFamily, new_options->MyFamily) ||
!opt_streq(old_options->AccountingStart, new_options->AccountingStart) 
||
old_options->AccountingMax != new_options->AccountingMax ||
old_options->AccountingRule != new_options->AccountingRule ||
@@@ -6584,11 -6350,65 +6595,60 @@@ warn_client_dns_cache(const char *optio
  }
  
  /**
+  * Validate the configured bridge distribution method from a 
BridgeDistribution
+  * config line.
+  *
+  * The input bd, is a string taken from the BridgeDistribution config
+  * line (if present).  If the option wasn't set, return 0 immediately.  The
+  * BridgeDistribution option is then validated.  Currently valid, recognised
+  * options are:
+  *
+  * - "none"
+  * - "any"
+  * - "https"
+  * - "email"
+  * - "moat"
+  * - "hyphae"
+  *
+  * If the option string is unrecognised, a warning will be logged and 0 is
+  * returned.  If the option string contains an invalid character, -1 is
+  * returned.
+  **/
+ STATIC int
+ check_bridge_distribution_setting(const char *bd)
+ {
+   if (bd == NULL)
+ return 0;
+ 
+   const char *RECOGNIZED[] = {
+ "none", "any", "https", "email", "moat", "hyphae"
+   };
+   unsigned i;
+   for (i = 0; i < ARRAY_LENGTH(RECOGNIZED); ++i) {
+ if (!strcmp(bd, RECOGNIZED[i]))
+   return 0;
+   }
+ 
+   const char *cp = bd;
+   //  Method = (KeywordChar | "_") +
+   while (TOR_ISALNUM(*cp) || *cp == '-' || *cp == '_')
+ ++cp;
+ 
+   if (*cp == 0) {
+ log_warn(LD_CONFIG, "Unrecognized BridgeDistribution value %s. I'll "
+"assume you know what you are doing...", escaped(bd));
+ return 0; // we reached the end of the string; all is well
+   } else {
+ return -1; // we found a bad character in the string.
+   }
+ }
+ 
+ /**
   * Parse port

[tor-commits] [tor/release-0.3.2] test: Add unittest for descriptors with BridgeDistribution option.

2017-10-24 Thread nickm 
commit 02cde0d9398c43de3a67133b7982d9df6962fe32
Author: Isis Lovecruft 
Date:   Mon Oct 23 19:44:06 2017 +

test: Add unittest for descriptors with BridgeDistribution option.
---
 src/or/config.c|   3 +-
 src/or/config.h|   1 +
 src/test/include.am|   1 +
 src/test/test.c|   1 +
 src/test/test_config.c |  63 
 src/test/test_router.c | 109 +
 6 files changed, 176 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 4d08a0795..0b1e6bed1 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -654,7 +654,6 @@ static int parse_ports(or_options_t *options, int 
validate_only,
 static int check_server_ports(const smartlist_t *ports,
   const or_options_t *options,
   int *num_low_ports_out);
-static int check_bridge_distribution_setting(const char *bd);
 static int validate_data_directory(or_options_t *options);
 static int write_configuration_file(const char *fname,
 const or_options_t *options);
@@ -6370,7 +6369,7 @@ warn_client_dns_cache(const char *option, int disabling)
  * returned.  If the option string contains an invalid character, -1 is
  * returned.
  **/
-static int
+STATIC int
 check_bridge_distribution_setting(const char *bd)
 {
   if (bd == NULL)
diff --git a/src/or/config.h b/src/or/config.h
index 664553251..096937cb6 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -199,6 +199,7 @@ STATIC int parse_port_config(smartlist_t *out,
   const char *defaultaddr,
   int defaultport,
   const unsigned flags);
+STATIC int check_bridge_distribution_setting(const char *bd);
 #endif
 
 #endif
diff --git a/src/test/include.am b/src/test/include.am
index 8ecfaf10c..6cefc6c5a 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -115,6 +115,7 @@ src_test_test_SOURCES = \
src/test/test_relaycell.c \
src/test/test_rendcache.c \
src/test/test_replay.c \
+   src/test/test_router.c \
src/test/test_routerkeys.c \
src/test/test_routerlist.c \
src/test/test_routerset.c \
diff --git a/src/test/test.c b/src/test/test.c
index 9a41b976b..733732609 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1220,6 +1220,7 @@ struct testgroup_t testgroups[] = {
   { "relaycell/", relaycell_tests },
   { "rend_cache/", rend_cache_tests },
   { "replaycache/", replaycache_tests },
+  { "router/", router_tests },
   { "routerkeys/", routerkeys_tests },
   { "routerlist/", routerlist_tests },
   { "routerset/" , routerset_tests },
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 89f9b3e2a..396f06adf 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -4890,6 +4890,65 @@ 
test_config_parse_port_config__ports__server_options(void *data)
   config_free_lines(config_port_valid); config_port_valid = NULL;
 }
 
+/* If we're not configured to be a bridge, but we set
+ * BridgeDistribution, then options_validate () should return -1. */
+static void
+test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
+  or_options_t* options = get_options_mutable();
+  or_options_t* old_options = options;
+  or_options_t* default_options = options;
+  char* message = (char*)("");
+  int ret;
+
+  (void)arg;
+
+  options->BridgeRelay = 0;
+  options->BridgeDistribution = (char*)("https");
+
+  ret = options_validate(old_options, options, default_options, 0, );
+
+  tt_int_op(ret, OP_EQ, -1);
+ done:
+  return;
+}
+
+/* If the BridgeDistribution setting was valid, 0 should be returned. */
+static void
+test_config_check_bridge_distribution_setting_valid(void *arg) {
+  int ret = check_bridge_distribution_setting("https");
+
+  (void)arg;
+
+  tt_int_op(ret, OP_EQ, 0);
+ done:
+  return;
+}
+
+/* If the BridgeDistribution setting was invalid, -1 should be returned. */
+static void
+test_config_check_bridge_distribution_setting_invalid(void *arg) {
+  int ret = check_bridge_distribution_setting("hyphens-are-not-allowed");
+
+  (void)arg;
+
+  tt_int_op(ret, OP_EQ, -1);
+ done:
+  return;
+}
+
+/* If the BridgeDistribution setting was unrecognised, a warning should be
+ * logged and 0 should be returned. */
+static void
+test_config_check_bridge_distribution_setting_unrecognised(void *arg) {
+  int ret = check_bridge_distribution_setting("unicorn");
+
+  (void)arg;
+
+  tt_int_op(ret, OP_EQ, 0);
+ done:
+  return;
+}
+
 #define CONFIG_TEST(name, flags)  \
   { #name, test_config_ ## name, flags, NULL, NULL }
 
@@ -4916,6 +4975,10 @@ struct testcase_t config_tests[] = {
   CONFIG_TEST(parse_port_config__ports__no_ports_given, 0),
   CONFIG_TEST(parse_port_config__ports__server_options, 0),
   CONFIG_TEST(parse_port_config__ports__ports_given, 0),
+  CONFIG_TEST(check_bridge_distribution_setting_not_a_bridge, TT_FORK),
+

[tor-commits] [tor/master] Isis has been noticing typos.

2017-10-24 Thread nickm 
commit 8cc57bccfe9acd3d64ef30349c3727586e253bb3
Author: Nick Mathewson 
Date:   Tue Oct 24 19:37:09 2017 -0400

Isis has been noticing typos.
---
 src/or/or.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/or.h b/src/or/or.h
index 8c1ef478e..f1e78ab02 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -2234,12 +2234,12 @@ typedef struct {
  * uploaded it. */
 #define ROUTER_PURPOSE_GENERAL 0
 /** Tor should avoid using this router for circuit-building: we got it
- * from a crontroller.  If the controller wants to use it, it'll have to
+ * from a controller.  If the controller wants to use it, it'll have to
  * ask for it by identity. */
 #define ROUTER_PURPOSE_CONTROLLER 1
 /** Tor should use this router only for bridge positions in circuits: we got
  * it via a directory request from the bridge itself, or a bridge
- * authority. x*/
+ * authority. */
 #define ROUTER_PURPOSE_BRIDGE 2
 /** Tor should not use this router; it was marked in cached-descriptors with
  * a purpose we didn't recognize. */



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] test: Add unittest for descriptors with BridgeDistribution option.

2017-10-24 Thread nickm 
commit 02cde0d9398c43de3a67133b7982d9df6962fe32
Author: Isis Lovecruft 
Date:   Mon Oct 23 19:44:06 2017 +

test: Add unittest for descriptors with BridgeDistribution option.
---
 src/or/config.c|   3 +-
 src/or/config.h|   1 +
 src/test/include.am|   1 +
 src/test/test.c|   1 +
 src/test/test_config.c |  63 
 src/test/test_router.c | 109 +
 6 files changed, 176 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 4d08a0795..0b1e6bed1 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -654,7 +654,6 @@ static int parse_ports(or_options_t *options, int 
validate_only,
 static int check_server_ports(const smartlist_t *ports,
   const or_options_t *options,
   int *num_low_ports_out);
-static int check_bridge_distribution_setting(const char *bd);
 static int validate_data_directory(or_options_t *options);
 static int write_configuration_file(const char *fname,
 const or_options_t *options);
@@ -6370,7 +6369,7 @@ warn_client_dns_cache(const char *option, int disabling)
  * returned.  If the option string contains an invalid character, -1 is
  * returned.
  **/
-static int
+STATIC int
 check_bridge_distribution_setting(const char *bd)
 {
   if (bd == NULL)
diff --git a/src/or/config.h b/src/or/config.h
index 664553251..096937cb6 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -199,6 +199,7 @@ STATIC int parse_port_config(smartlist_t *out,
   const char *defaultaddr,
   int defaultport,
   const unsigned flags);
+STATIC int check_bridge_distribution_setting(const char *bd);
 #endif
 
 #endif
diff --git a/src/test/include.am b/src/test/include.am
index 8ecfaf10c..6cefc6c5a 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -115,6 +115,7 @@ src_test_test_SOURCES = \
src/test/test_relaycell.c \
src/test/test_rendcache.c \
src/test/test_replay.c \
+   src/test/test_router.c \
src/test/test_routerkeys.c \
src/test/test_routerlist.c \
src/test/test_routerset.c \
diff --git a/src/test/test.c b/src/test/test.c
index 9a41b976b..733732609 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1220,6 +1220,7 @@ struct testgroup_t testgroups[] = {
   { "relaycell/", relaycell_tests },
   { "rend_cache/", rend_cache_tests },
   { "replaycache/", replaycache_tests },
+  { "router/", router_tests },
   { "routerkeys/", routerkeys_tests },
   { "routerlist/", routerlist_tests },
   { "routerset/" , routerset_tests },
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 89f9b3e2a..396f06adf 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -4890,6 +4890,65 @@ 
test_config_parse_port_config__ports__server_options(void *data)
   config_free_lines(config_port_valid); config_port_valid = NULL;
 }
 
+/* If we're not configured to be a bridge, but we set
+ * BridgeDistribution, then options_validate () should return -1. */
+static void
+test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
+  or_options_t* options = get_options_mutable();
+  or_options_t* old_options = options;
+  or_options_t* default_options = options;
+  char* message = (char*)("");
+  int ret;
+
+  (void)arg;
+
+  options->BridgeRelay = 0;
+  options->BridgeDistribution = (char*)("https");
+
+  ret = options_validate(old_options, options, default_options, 0, );
+
+  tt_int_op(ret, OP_EQ, -1);
+ done:
+  return;
+}
+
+/* If the BridgeDistribution setting was valid, 0 should be returned. */
+static void
+test_config_check_bridge_distribution_setting_valid(void *arg) {
+  int ret = check_bridge_distribution_setting("https");
+
+  (void)arg;
+
+  tt_int_op(ret, OP_EQ, 0);
+ done:
+  return;
+}
+
+/* If the BridgeDistribution setting was invalid, -1 should be returned. */
+static void
+test_config_check_bridge_distribution_setting_invalid(void *arg) {
+  int ret = check_bridge_distribution_setting("hyphens-are-not-allowed");
+
+  (void)arg;
+
+  tt_int_op(ret, OP_EQ, -1);
+ done:
+  return;
+}
+
+/* If the BridgeDistribution setting was unrecognised, a warning should be
+ * logged and 0 should be returned. */
+static void
+test_config_check_bridge_distribution_setting_unrecognised(void *arg) {
+  int ret = check_bridge_distribution_setting("unicorn");
+
+  (void)arg;
+
+  tt_int_op(ret, OP_EQ, 0);
+ done:
+  return;
+}
+
 #define CONFIG_TEST(name, flags)  \
   { #name, test_config_ ## name, flags, NULL, NULL }
 
@@ -4916,6 +4975,10 @@ struct testcase_t config_tests[] = {
   CONFIG_TEST(parse_port_config__ports__no_ports_given, 0),
   CONFIG_TEST(parse_port_config__ports__server_options, 0),
   CONFIG_TEST(parse_port_config__ports__ports_given, 0),
+  CONFIG_TEST(check_bridge_distribution_setting_not_a_bridge, TT_FORK),
+

[tor-commits] [tor/master] Merge branch 'feature18329_029_squashed' into maint-0.3.2

2017-10-24 Thread nickm 
commit 594cf92498c8ea12dc0b19f743d6b88d4a98f1eb
Merge: 122a7f884 02cde0d93
Author: Nick Mathewson 
Date:   Tue Oct 24 19:35:28 2017 -0400

Merge branch 'feature18329_029_squashed' into maint-0.3.2

 changes/feature18329   |   9 
 doc/tor.1.txt  |  11 +
 src/or/config.c|  62 +++-
 src/or/config.h|   2 +
 src/or/or.h|   4 ++
 src/or/router.c|  12 ++
 src/test/include.am|   1 +
 src/test/test.c|   1 +
 src/test/test_config.c |  63 
 src/test/test_router.c | 109 +
 10 files changed, 273 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index a2353b94d,0b1e6bed1..b123d4935
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -253,15 -182,14 +253,16 @@@ static config_var_t option_vars_[] = 
V(BridgePassword,  STRING,   NULL),
V(BridgeRecordUsageByCountry,  BOOL, "1"),
V(BridgeRelay, BOOL, "0"),
+   V(BridgeDistribution,  STRING,   NULL),
V(CellStatistics,  BOOL, "0"),
 +  V(PaddingStatistics,   BOOL, "1"),
V(LearnCircuitBuildTimeout,BOOL, "1"),
V(CircuitBuildTimeout, INTERVAL, "0"),
 -  V(CircuitIdleTimeout,  INTERVAL, "1 hour"),
 +  OBSOLETE("CircuitIdleTimeout"),
 +  V(CircuitsAvailableTimeout,INTERVAL, "0"),
V(CircuitStreamTimeout,INTERVAL, "0"),
V(CircuitPriorityHalflife, DOUBLE,  "-100.0"), /*negative:'Use 
default'*/
 -  V(ClientDNSRejectInternalAddresses, BOOL,"1"),
 +  V(TestingClientDNSRejectInternalAddresses, BOOL,"1"),
V(ClientOnly,  BOOL, "0"),
V(ClientPreferIPv6ORPort,  AUTOBOOL, "auto"),
V(ClientPreferIPv6DirPort, AUTOBOOL, "auto"),
@@@ -3504,14 -3346,16 +3504,23 @@@ options_validate(or_options_t *old_opti
  options->DirPort_set = 0;
}
  
 +  if (server_mode(options) && options->ConnectionPadding != -1) {
 +REJECT("Relays must use 'auto' for the ConnectionPadding setting.");
 +  }
 +
 +  if (server_mode(options) && options->ReducedConnectionPadding != 0) {
 +REJECT("Relays cannot set ReducedConnectionPadding. ");
 +  }
 +
+   if (options->BridgeDistribution) {
+ if (!options->BridgeRelay) {
+   REJECT("You set BridgeDistribution, but you didn't set BridgeRelay!");
+ }
+ if (check_bridge_distribution_setting(options->BridgeDistribution) < 0) {
+   REJECT("Invalid BridgeDistribution value.");
+ }
+   }
+ 
 -
if (options->MinUptimeHidServDirectoryV2 < 0) {
  log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
  "least 0 seconds. Changing to 0.");
@@@ -4686,7 -4507,9 +4695,9 @@@ options_transition_affects_descriptor(c
get_effective_bwburst(old_options) !=
  get_effective_bwburst(new_options) ||
!opt_streq(old_options->ContactInfo, new_options->ContactInfo) ||
+   !opt_streq(old_options->BridgeDistribution,
+  new_options->BridgeDistribution) ||
 -  !opt_streq(old_options->MyFamily, new_options->MyFamily) ||
 +  !config_lines_eq(old_options->MyFamily, new_options->MyFamily) ||
!opt_streq(old_options->AccountingStart, new_options->AccountingStart) 
||
old_options->AccountingMax != new_options->AccountingMax ||
old_options->AccountingRule != new_options->AccountingRule ||
@@@ -6584,11 -6350,65 +6595,60 @@@ warn_client_dns_cache(const char *optio
  }
  
  /**
+  * Validate the configured bridge distribution method from a 
BridgeDistribution
+  * config line.
+  *
+  * The input bd, is a string taken from the BridgeDistribution config
+  * line (if present).  If the option wasn't set, return 0 immediately.  The
+  * BridgeDistribution option is then validated.  Currently valid, recognised
+  * options are:
+  *
+  * - "none"
+  * - "any"
+  * - "https"
+  * - "email"
+  * - "moat"
+  * - "hyphae"
+  *
+  * If the option string is unrecognised, a warning will be logged and 0 is
+  * returned.  If the option string contains an invalid character, -1 is
+  * returned.
+  **/
+ STATIC int
+ check_bridge_distribution_setting(const char *bd)
+ {
+   if (bd == NULL)
+ return 0;
+ 
+   const char *RECOGNIZED[] = {
+ "none", "any", "https", "email", "moat", "hyphae"
+   };
+   unsigned i;
+   for (i = 0; i < ARRAY_LENGTH(RECOGNIZED); ++i) {
+ if (!strcmp(bd, RECOGNIZED[i]))
+   return 0;
+   }
+ 
+   const char *cp = bd;
+   //  Method = (KeywordChar | "_") +
+   while (TOR_ISALNUM(*cp) || *cp == '-' || *cp == '_')
+ ++cp;
+ 
+   if (*cp == 0) {
+ log_warn(LD_CONFIG, "Unrecognized BridgeDistribution value %s. I'll "
+"assume you know what you are doing...", escaped(bd));
+ return 0; // we reached the end of the string; all is well
+   } else {
+ return -1; // we found a bad character in the string.
+   }
+ }
+ 
+ /**
   * Parse port

[tor-commits] [tor/master] Tweak the documentation for BridgeDistribution

2017-10-24 Thread nickm 
commit 3581f93d273dfd9fbc56de907b7e3b77575614e1
Author: Nick Mathewson 
Date:   Mon Oct 23 10:38:19 2017 -0400

Tweak the documentation for BridgeDistribution

Note that it will have no effect yet; note that the default is
"any".
---
 changes/feature18329 | 5 -
 doc/tor.1.txt| 7 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/changes/feature18329 b/changes/feature18329
index 7fdb659e8..f534c7614 100644
--- a/changes/feature18329
+++ b/changes/feature18329
@@ -2,5 +2,8 @@
 - Bridge relays can now set the BridgeDistribution config option to
   add a "bridge-distribution-request" line to their bridge descriptor,
   which tells BridgeDB how they'd like their bridge address to be
-  given out. Implements tickets 18329.
+  given out. (Note that as of Oct 2017, BridgeDB does not yet implement
+  this feature.) As a side benefit, this feature provides a way
+  to distinguish bridge descriptors from non-bridge descriptors.
+  Implements tickets 18329.
 
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 7da5ba3fe..52e81860b 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1651,7 +1651,12 @@ is non-zero):
 If set along with BridgeRelay, Tor will include a new line in its
 bridge descriptor which indicates to the BridgeDB service how it
 would like its bridge address to be given out. Set it to "none" if
-you want BridgeDB to avoid distributing your bridge address.
+you want BridgeDB to avoid distributing your bridge address, or "any" to
+let BridgeDB decide. (Default: any)
+ +
+Note: as of Oct 2017, the BridgeDB part of this option is not yet
+implemented.  Until BridgeDB is updated to obey this option, your
+bridge will make this request, but it will not (yet) be obeyed.
 
 [[ContactInfo]] **ContactInfo** __email_address__::
 Administrative contact information for this relay or bridge. This line



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Add new BridgeDistribution config option

2017-10-24 Thread nickm 
commit ebab5215252f9fa810ae091c335c5ae6e619faaf
Author: Roger Dingledine 
Date:   Sun Nov 13 02:39:16 2016 -0500

Add new BridgeDistribution config option

Bridge relays can use it to add a "bridge-distribution-request" line
to their bridge descriptor, which tells BridgeDB how they'd like their
bridge address to be given out.

Implements tickets 18329.
---
 changes/feature18329 | 6 ++
 doc/tor.1.txt| 6 ++
 src/or/config.c  | 7 +++
 src/or/or.h  | 4 
 src/or/router.c  | 8 
 5 files changed, 31 insertions(+)

diff --git a/changes/feature18329 b/changes/feature18329
new file mode 100644
index 0..7fdb659e8
--- /dev/null
+++ b/changes/feature18329
@@ -0,0 +1,6 @@
+  o Minor features:
+- Bridge relays can now set the BridgeDistribution config option to
+  add a "bridge-distribution-request" line to their bridge descriptor,
+  which tells BridgeDB how they'd like their bridge address to be
+  given out. Implements tickets 18329.
+
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index f1068cedc..7da5ba3fe 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1647,6 +1647,12 @@ is non-zero):
 server descriptor to the bridge database, rather than
 to the public directory authorities.
 
+[[BridgeDistribution]] **BridgeDistribution** __string__::
+If set along with BridgeRelay, Tor will include a new line in its
+bridge descriptor which indicates to the BridgeDB service how it
+would like its bridge address to be given out. Set it to "none" if
+you want BridgeDB to avoid distributing your bridge address.
+
 [[ContactInfo]] **ContactInfo** __email_address__::
 Administrative contact information for this relay or bridge. This line
 can be used to contact you if your relay or bridge is misconfigured or
diff --git a/src/or/config.c b/src/or/config.c
index 08cc5cdf5..1bdfdf484 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -182,6 +182,7 @@ static config_var_t option_vars_[] = {
   V(BridgePassword,  STRING,   NULL),
   V(BridgeRecordUsageByCountry,  BOOL, "1"),
   V(BridgeRelay, BOOL, "0"),
+  V(BridgeDistribution,  STRING,   NULL),
   V(CellStatistics,  BOOL, "0"),
   V(LearnCircuitBuildTimeout,BOOL, "1"),
   V(CircuitBuildTimeout, INTERVAL, "0"),
@@ -3346,6 +3347,10 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 options->DirPort_set = 0;
   }
 
+  if (options->BridgeDistribution && !options->BridgeRelay) {
+REJECT("You have set BridgeDistribution, yet you didn't set BridgeRelay!");
+  }
+
   if (options->MinUptimeHidServDirectoryV2 < 0) {
 log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
 "least 0 seconds. Changing to 0.");
@@ -4497,6 +4502,8 @@ options_transition_affects_descriptor(const or_options_t 
*old_options,
   get_effective_bwburst(old_options) !=
 get_effective_bwburst(new_options) ||
   !opt_streq(old_options->ContactInfo, new_options->ContactInfo) ||
+  !opt_streq(old_options->BridgeDistribution,
+ new_options->BridgeDistribution) ||
   !opt_streq(old_options->MyFamily, new_options->MyFamily) ||
   !opt_streq(old_options->AccountingStart, new_options->AccountingStart) ||
   old_options->AccountingMax != new_options->AccountingMax ||
diff --git a/src/or/or.h b/src/or/or.h
index 33fe8b96c..3d61cfa05 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3638,6 +3638,10 @@ typedef struct {
   int BridgeAuthoritativeDir; /**< Boolean: is this an authoritative directory
* that aggregates bridge descriptors? */
 
+  /** If set on a bridge relay, it will include this value on a new
+   * "bridge-distribution-request" line in its bridge descriptor. */
+  char *BridgeDistribution;
+
   /** If set on a bridge authority, it will answer requests on its dirport
* for bridge statuses -- but only if the requests use this password. */
   char *BridgePassword;
diff --git a/src/or/router.c b/src/or/router.c
index 6d3a32a60..780d0444f 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2867,6 +2867,14 @@ router_dump_router_to_string(routerinfo_t *router,
 smartlist_add_asprintf(chunks, "contact %s\n", ci);
   }
 
+  if (options->BridgeRelay && options->BridgeDistribution &&
+  strlen(options->BridgeDistribution)) {
+const char *bd = options->BridgeDistribution;
+if (strchr(bd, '\n') || strchr(bd, '\r'))
+  bd = escaped(bd);
+smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd);
+  }
+
   if (router->onion_curve25519_pkey) {
 char kbuf[128];
 base64_encode(kbuf, sizeof(kbuf),



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Updates to fix check-spaces/check-changes warnings

2017-10-24 Thread nickm 
commit f3af74ccf594c07f7edbf0bdfa576b9af21563d9
Author: Nick Mathewson 
Date:   Tue Oct 24 19:35:16 2017 -0400

Updates to fix check-spaces/check-changes warnings
---
 changes/feature18329   |  2 +-
 src/or/config.c|  1 -
 src/test/test_config.c | 12 
 src/test/test_router.c |  7 +--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/changes/feature18329 b/changes/feature18329
index f534c7614..1dabf5024 100644
--- a/changes/feature18329
+++ b/changes/feature18329
@@ -1,4 +1,4 @@
-  o Minor features:
+  o Minor features (bridge):
 - Bridge relays can now set the BridgeDistribution config option to
   add a "bridge-distribution-request" line to their bridge descriptor,
   which tells BridgeDB how they'd like their bridge address to be
diff --git a/src/or/config.c b/src/or/config.c
index 0b1e6bed1..330e8dcdd 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3355,7 +3355,6 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 }
   }
 
-
   if (options->MinUptimeHidServDirectoryV2 < 0) {
 log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
 "least 0 seconds. Changing to 0.");
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 593d3ca8f..978a24b81 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -4893,7 +4893,8 @@ test_config_parse_port_config__ports__server_options(void 
*data)
 /* If we're not configured to be a bridge, but we set
  * BridgeDistribution, then options_validate () should return -1. */
 static void
-test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
+test_config_check_bridge_distribution_setting_not_a_bridge(void *arg)
+{
   or_options_t* options = get_options_mutable();
   or_options_t* old_options = options;
   or_options_t* default_options = options;
@@ -4914,7 +4915,8 @@ 
test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
 
 /* If the BridgeDistribution setting was valid, 0 should be returned. */
 static void
-test_config_check_bridge_distribution_setting_valid(void *arg) {
+test_config_check_bridge_distribution_setting_valid(void *arg)
+{
   int ret = check_bridge_distribution_setting("https");
 
   (void)arg;
@@ -4926,7 +4928,8 @@ test_config_check_bridge_distribution_setting_valid(void 
*arg) {
 
 /* If the BridgeDistribution setting was invalid, -1 should be returned. */
 static void
-test_config_check_bridge_distribution_setting_invalid(void *arg) {
+test_config_check_bridge_distribution_setting_invalid(void *arg)
+{
   int ret = check_bridge_distribution_setting("hyphens-are-allowed");
 
   (void)arg;
@@ -4943,7 +4946,8 @@ 
test_config_check_bridge_distribution_setting_invalid(void *arg) {
 /* If the BridgeDistribution setting was unrecognised, a warning should be
  * logged and 0 should be returned. */
 static void
-test_config_check_bridge_distribution_setting_unrecognised(void *arg) {
+test_config_check_bridge_distribution_setting_unrecognised(void *arg)
+{
   int ret = check_bridge_distribution_setting("unicorn");
 
   (void)arg;
diff --git a/src/test/test_router.c b/src/test/test_router.c
index 64434035e..4e96e2453 100644
--- a/src/test/test_router.c
+++ b/src/test/test_router.c
@@ -22,7 +22,8 @@ NS_DECL(const routerinfo_t *, router_get_my_routerinfo, 
(void));
 static routerinfo_t* mock_routerinfo;
 
 static const routerinfo_t*
-NS(router_get_my_routerinfo)(void) {
+NS(router_get_my_routerinfo)(void)
+{
   crypto_pk_t* ident_key;
   crypto_pk_t* tap_key;
   time_t now;
@@ -57,7 +58,8 @@ NS(router_get_my_routerinfo)(void) {
 /* If no distribution option was set, then check_bridge_distribution_setting()
  * should have set it to "any". */
 static void
-test_router_dump_router_to_string_no_bridge_distribution_method(void *arg) {
+test_router_dump_router_to_string_no_bridge_distribution_method(void *arg)
+{
   const char* needle = "bridge-distribution-request any";
   or_options_t* options = get_options_mutable();
   routerinfo_t* router = NULL;
@@ -107,3 +109,4 @@ struct testcase_t router_tests[] = {
   ROUTER_TEST(dump_router_to_string_no_bridge_distribution_method, TT_FORK),
   END_OF_TESTCASES
 };
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] doc: Improve documentation for check_bridge_distribution_setting().

2017-10-24 Thread nickm 
commit b0e10f23ba2b03f275ef4acf2183a02042e6cded
Author: Isis Lovecruft 
Date:   Mon Oct 23 19:37:52 2017 +

doc: Improve documentation for check_bridge_distribution_setting().
---
 src/or/config.c | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 7f45bb2cb..4d08a0795 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6350,8 +6350,26 @@ warn_client_dns_cache(const char *option, int disabling)
   "to your destination.");
 }
 
-/** Warn if bd is an unrecognized bridge distribution setting;
- * return -1 if it is invalid. */
+/**
+ * Validate the configured bridge distribution method from a BridgeDistribution
+ * config line.
+ *
+ * The input bd, is a string taken from the BridgeDistribution config
+ * line (if present).  If the option wasn't set, return 0 immediately.  The
+ * BridgeDistribution option is then validated.  Currently valid, recognised
+ * options are:
+ *
+ * - "none"
+ * - "any"
+ * - "https"
+ * - "email"
+ * - "moat"
+ * - "hyphae"
+ *
+ * If the option string is unrecognised, a warning will be logged and 0 is
+ * returned.  If the option string contains an invalid character, -1 is
+ * returned.
+ **/
 static int
 check_bridge_distribution_setting(const char *bd)
 {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

2017-10-24 Thread nickm 
commit 8d908b961fc90628c449b344f5181eeec3e3bd70
Merge: 8cc57bccf b95ef19a7
Author: Nick Mathewson 
Date:   Tue Oct 24 19:37:11 2017 -0400

Merge branch 'maint-0.3.2'

 changes/feature18329   |   9 
 doc/tor.1.txt  |  11 +
 src/or/config.c|  62 ++-
 src/or/config.h|   2 +
 src/or/or.h|   4 ++
 src/or/router.c|  12 ++
 src/test/include.am|   1 +
 src/test/test.c|   1 +
 src/test/test_config.c |  71 +++
 src/test/test_router.c | 112 +
 10 files changed, 284 insertions(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Always set bridge-distribution-request on bridges' descriptors.

2017-10-24 Thread nickm 
commit 613b18f0afd865b0fc5daf8d17da241396100dcd
Author: Nick Mathewson 
Date:   Mon Oct 23 10:52:42 2017 -0400

Always set bridge-distribution-request on bridges' descriptors.

Also, warn the user if the BridgeDistribution option is
unrecognized, and reject the value if it is invalid.
---
 src/or/config.c | 43 ---
 src/or/router.c | 10 +++---
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 1bdfdf484..7f45bb2cb 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -654,7 +654,7 @@ static int parse_ports(or_options_t *options, int 
validate_only,
 static int check_server_ports(const smartlist_t *ports,
   const or_options_t *options,
   int *num_low_ports_out);
-
+static int check_bridge_distribution_setting(const char *bd);
 static int validate_data_directory(or_options_t *options);
 static int write_configuration_file(const char *fname,
 const or_options_t *options);
@@ -3347,10 +3347,16 @@ options_validate(or_options_t *old_options, 
or_options_t *options,
 options->DirPort_set = 0;
   }
 
-  if (options->BridgeDistribution && !options->BridgeRelay) {
-REJECT("You have set BridgeDistribution, yet you didn't set BridgeRelay!");
+  if (options->BridgeDistribution) {
+if (!options->BridgeRelay) {
+  REJECT("You set BridgeDistribution, but you didn't set BridgeRelay!");
+}
+if (check_bridge_distribution_setting(options->BridgeDistribution) < 0) {
+  REJECT("Invalid BridgeDistribution value.");
+}
   }
 
+
   if (options->MinUptimeHidServDirectoryV2 < 0) {
 log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
 "least 0 seconds. Changing to 0.");
@@ -6344,6 +6350,37 @@ warn_client_dns_cache(const char *option, int disabling)
   "to your destination.");
 }
 
+/** Warn if bd is an unrecognized bridge distribution setting;
+ * return -1 if it is invalid. */
+static int
+check_bridge_distribution_setting(const char *bd)
+{
+  if (bd == NULL)
+return 0;
+
+  const char *RECOGNIZED[] = {
+"none", "any", "https", "email", "moat", "hyphae"
+  };
+  unsigned i;
+  for (i = 0; i < ARRAY_LENGTH(RECOGNIZED); ++i) {
+if (!strcmp(bd, RECOGNIZED[i]))
+  return 0;
+  }
+
+  const char *cp = bd;
+  //  Method = (KeywordChar | "_") +
+  while (TOR_ISALNUM(*cp) || *cp == '-' || *cp == '_')
+++cp;
+
+  if (*cp == 0) {
+log_warn(LD_CONFIG, "Unrecognized BridgeDistribution value %s. I'll "
+   "assume you know what you are doing...", escaped(bd));
+return 0; // we reached the end of the string; all is well
+  } else {
+return -1; // we found a bad character in the string.
+  }
+}
+
 /**
  * Parse port configuration for a single port type.
  *
diff --git a/src/or/router.c b/src/or/router.c
index 780d0444f..553264efa 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2867,9 +2867,13 @@ router_dump_router_to_string(routerinfo_t *router,
 smartlist_add_asprintf(chunks, "contact %s\n", ci);
   }
 
-  if (options->BridgeRelay && options->BridgeDistribution &&
-  strlen(options->BridgeDistribution)) {
-const char *bd = options->BridgeDistribution;
+  if (options->BridgeRelay) {
+const char *bd;
+if (options->BridgeDistribution && strlen(options->BridgeDistribution)) {
+  bd = options->BridgeDistribution;
+} else {
+  bd = "any";
+}
 if (strchr(bd, '\n') || strchr(bd, '\r'))
   bd = escaped(bd);
 smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge branch 'feature18329_029_squashed' into maint-0.3.2

2017-10-24 Thread nickm 
commit b95ef19a77e2e04c740bbbe16d3b0ed7a5239aee
Merge: 594cf9249 f3af74ccf
Author: Nick Mathewson 
Date:   Tue Oct 24 19:35:32 2017 -0400

Merge branch 'feature18329_029_squashed' into maint-0.3.2

 changes/feature18329   |  2 +-
 src/test/test_config.c | 18 +-
 src/test/test_router.c |  7 +--
 3 files changed, 19 insertions(+), 8 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Merge branch 'feature18329_029_squashed' into maint-0.3.2

2017-10-24 Thread nickm 
commit 594cf92498c8ea12dc0b19f743d6b88d4a98f1eb
Merge: 122a7f884 02cde0d93
Author: Nick Mathewson 
Date:   Tue Oct 24 19:35:28 2017 -0400

Merge branch 'feature18329_029_squashed' into maint-0.3.2

 changes/feature18329   |   9 
 doc/tor.1.txt  |  11 +
 src/or/config.c|  62 +++-
 src/or/config.h|   2 +
 src/or/or.h|   4 ++
 src/or/router.c|  12 ++
 src/test/include.am|   1 +
 src/test/test.c|   1 +
 src/test/test_config.c |  63 
 src/test/test_router.c | 109 +
 10 files changed, 273 insertions(+), 1 deletion(-)

diff --cc src/or/config.c
index a2353b94d,0b1e6bed1..b123d4935
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -253,15 -182,14 +253,16 @@@ static config_var_t option_vars_[] = 
V(BridgePassword,  STRING,   NULL),
V(BridgeRecordUsageByCountry,  BOOL, "1"),
V(BridgeRelay, BOOL, "0"),
+   V(BridgeDistribution,  STRING,   NULL),
V(CellStatistics,  BOOL, "0"),
 +  V(PaddingStatistics,   BOOL, "1"),
V(LearnCircuitBuildTimeout,BOOL, "1"),
V(CircuitBuildTimeout, INTERVAL, "0"),
 -  V(CircuitIdleTimeout,  INTERVAL, "1 hour"),
 +  OBSOLETE("CircuitIdleTimeout"),
 +  V(CircuitsAvailableTimeout,INTERVAL, "0"),
V(CircuitStreamTimeout,INTERVAL, "0"),
V(CircuitPriorityHalflife, DOUBLE,  "-100.0"), /*negative:'Use 
default'*/
 -  V(ClientDNSRejectInternalAddresses, BOOL,"1"),
 +  V(TestingClientDNSRejectInternalAddresses, BOOL,"1"),
V(ClientOnly,  BOOL, "0"),
V(ClientPreferIPv6ORPort,  AUTOBOOL, "auto"),
V(ClientPreferIPv6DirPort, AUTOBOOL, "auto"),
@@@ -3504,14 -3346,16 +3504,23 @@@ options_validate(or_options_t *old_opti
  options->DirPort_set = 0;
}
  
 +  if (server_mode(options) && options->ConnectionPadding != -1) {
 +REJECT("Relays must use 'auto' for the ConnectionPadding setting.");
 +  }
 +
 +  if (server_mode(options) && options->ReducedConnectionPadding != 0) {
 +REJECT("Relays cannot set ReducedConnectionPadding. ");
 +  }
 +
+   if (options->BridgeDistribution) {
+ if (!options->BridgeRelay) {
+   REJECT("You set BridgeDistribution, but you didn't set BridgeRelay!");
+ }
+ if (check_bridge_distribution_setting(options->BridgeDistribution) < 0) {
+   REJECT("Invalid BridgeDistribution value.");
+ }
+   }
+ 
 -
if (options->MinUptimeHidServDirectoryV2 < 0) {
  log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
  "least 0 seconds. Changing to 0.");
@@@ -4686,7 -4507,9 +4695,9 @@@ options_transition_affects_descriptor(c
get_effective_bwburst(old_options) !=
  get_effective_bwburst(new_options) ||
!opt_streq(old_options->ContactInfo, new_options->ContactInfo) ||
+   !opt_streq(old_options->BridgeDistribution,
+  new_options->BridgeDistribution) ||
 -  !opt_streq(old_options->MyFamily, new_options->MyFamily) ||
 +  !config_lines_eq(old_options->MyFamily, new_options->MyFamily) ||
!opt_streq(old_options->AccountingStart, new_options->AccountingStart) 
||
old_options->AccountingMax != new_options->AccountingMax ||
old_options->AccountingRule != new_options->AccountingRule ||
@@@ -6584,11 -6350,65 +6595,60 @@@ warn_client_dns_cache(const char *optio
  }
  
  /**
+  * Validate the configured bridge distribution method from a 
BridgeDistribution
+  * config line.
+  *
+  * The input bd, is a string taken from the BridgeDistribution config
+  * line (if present).  If the option wasn't set, return 0 immediately.  The
+  * BridgeDistribution option is then validated.  Currently valid, recognised
+  * options are:
+  *
+  * - "none"
+  * - "any"
+  * - "https"
+  * - "email"
+  * - "moat"
+  * - "hyphae"
+  *
+  * If the option string is unrecognised, a warning will be logged and 0 is
+  * returned.  If the option string contains an invalid character, -1 is
+  * returned.
+  **/
+ STATIC int
+ check_bridge_distribution_setting(const char *bd)
+ {
+   if (bd == NULL)
+ return 0;
+ 
+   const char *RECOGNIZED[] = {
+ "none", "any", "https", "email", "moat", "hyphae"
+   };
+   unsigned i;
+   for (i = 0; i < ARRAY_LENGTH(RECOGNIZED); ++i) {
+ if (!strcmp(bd, RECOGNIZED[i]))
+   return 0;
+   }
+ 
+   const char *cp = bd;
+   //  Method = (KeywordChar | "_") +
+   while (TOR_ISALNUM(*cp) || *cp == '-' || *cp == '_')
+ ++cp;
+ 
+   if (*cp == 0) {
+ log_warn(LD_CONFIG, "Unrecognized BridgeDistribution value %s. I'll "
+"assume you know what you are doing...", escaped(bd));
+ return 0; // we reached the end of the string; all is well
+   } else {
+ return -1; // we found a bad character in the string.
+   }
+ }
+ 
+ /**
   * Parse port

[tor-commits] [tor/maint-0.3.2] Adjust test to allow hyphens too.

2017-10-24 Thread nickm 
commit 44e8aaa9aa57bf6b9fce1712a8f77e5f9979392c
Author: Nick Mathewson 
Date:   Tue Oct 24 19:33:38 2017 -0400

Adjust test to allow hyphens too.
---
 src/test/test_config.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 396f06adf..593d3ca8f 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -4927,10 +4927,14 @@ 
test_config_check_bridge_distribution_setting_valid(void *arg) {
 /* If the BridgeDistribution setting was invalid, -1 should be returned. */
 static void
 test_config_check_bridge_distribution_setting_invalid(void *arg) {
-  int ret = check_bridge_distribution_setting("hyphens-are-not-allowed");
+  int ret = check_bridge_distribution_setting("hyphens-are-allowed");
 
   (void)arg;
 
+  tt_int_op(ret, OP_EQ, 0);
+
+  ret = check_bridge_distribution_setting("asterisks*are*forbidden");
+
   tt_int_op(ret, OP_EQ, -1);
  done:
   return;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Always set bridge-distribution-request on bridges' descriptors.

2017-10-24 Thread nickm 
commit 613b18f0afd865b0fc5daf8d17da241396100dcd
Author: Nick Mathewson 
Date:   Mon Oct 23 10:52:42 2017 -0400

Always set bridge-distribution-request on bridges' descriptors.

Also, warn the user if the BridgeDistribution option is
unrecognized, and reject the value if it is invalid.
---
 src/or/config.c | 43 ---
 src/or/router.c | 10 +++---
 2 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 1bdfdf484..7f45bb2cb 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -654,7 +654,7 @@ static int parse_ports(or_options_t *options, int 
validate_only,
 static int check_server_ports(const smartlist_t *ports,
   const or_options_t *options,
   int *num_low_ports_out);
-
+static int check_bridge_distribution_setting(const char *bd);
 static int validate_data_directory(or_options_t *options);
 static int write_configuration_file(const char *fname,
 const or_options_t *options);
@@ -3347,10 +3347,16 @@ options_validate(or_options_t *old_options, 
or_options_t *options,
 options->DirPort_set = 0;
   }
 
-  if (options->BridgeDistribution && !options->BridgeRelay) {
-REJECT("You have set BridgeDistribution, yet you didn't set BridgeRelay!");
+  if (options->BridgeDistribution) {
+if (!options->BridgeRelay) {
+  REJECT("You set BridgeDistribution, but you didn't set BridgeRelay!");
+}
+if (check_bridge_distribution_setting(options->BridgeDistribution) < 0) {
+  REJECT("Invalid BridgeDistribution value.");
+}
   }
 
+
   if (options->MinUptimeHidServDirectoryV2 < 0) {
 log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
 "least 0 seconds. Changing to 0.");
@@ -6344,6 +6350,37 @@ warn_client_dns_cache(const char *option, int disabling)
   "to your destination.");
 }
 
+/** Warn if bd is an unrecognized bridge distribution setting;
+ * return -1 if it is invalid. */
+static int
+check_bridge_distribution_setting(const char *bd)
+{
+  if (bd == NULL)
+return 0;
+
+  const char *RECOGNIZED[] = {
+"none", "any", "https", "email", "moat", "hyphae"
+  };
+  unsigned i;
+  for (i = 0; i < ARRAY_LENGTH(RECOGNIZED); ++i) {
+if (!strcmp(bd, RECOGNIZED[i]))
+  return 0;
+  }
+
+  const char *cp = bd;
+  //  Method = (KeywordChar | "_") +
+  while (TOR_ISALNUM(*cp) || *cp == '-' || *cp == '_')
+++cp;
+
+  if (*cp == 0) {
+log_warn(LD_CONFIG, "Unrecognized BridgeDistribution value %s. I'll "
+   "assume you know what you are doing...", escaped(bd));
+return 0; // we reached the end of the string; all is well
+  } else {
+return -1; // we found a bad character in the string.
+  }
+}
+
 /**
  * Parse port configuration for a single port type.
  *
diff --git a/src/or/router.c b/src/or/router.c
index 780d0444f..553264efa 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2867,9 +2867,13 @@ router_dump_router_to_string(routerinfo_t *router,
 smartlist_add_asprintf(chunks, "contact %s\n", ci);
   }
 
-  if (options->BridgeRelay && options->BridgeDistribution &&
-  strlen(options->BridgeDistribution)) {
-const char *bd = options->BridgeDistribution;
+  if (options->BridgeRelay) {
+const char *bd;
+if (options->BridgeDistribution && strlen(options->BridgeDistribution)) {
+  bd = options->BridgeDistribution;
+} else {
+  bd = "any";
+}
 if (strchr(bd, '\n') || strchr(bd, '\r'))
   bd = escaped(bd);
 smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd);



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Updates to fix check-spaces/check-changes warnings

2017-10-24 Thread nickm 
commit f3af74ccf594c07f7edbf0bdfa576b9af21563d9
Author: Nick Mathewson 
Date:   Tue Oct 24 19:35:16 2017 -0400

Updates to fix check-spaces/check-changes warnings
---
 changes/feature18329   |  2 +-
 src/or/config.c|  1 -
 src/test/test_config.c | 12 
 src/test/test_router.c |  7 +--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/changes/feature18329 b/changes/feature18329
index f534c7614..1dabf5024 100644
--- a/changes/feature18329
+++ b/changes/feature18329
@@ -1,4 +1,4 @@
-  o Minor features:
+  o Minor features (bridge):
 - Bridge relays can now set the BridgeDistribution config option to
   add a "bridge-distribution-request" line to their bridge descriptor,
   which tells BridgeDB how they'd like their bridge address to be
diff --git a/src/or/config.c b/src/or/config.c
index 0b1e6bed1..330e8dcdd 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3355,7 +3355,6 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 }
   }
 
-
   if (options->MinUptimeHidServDirectoryV2 < 0) {
 log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
 "least 0 seconds. Changing to 0.");
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 593d3ca8f..978a24b81 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -4893,7 +4893,8 @@ test_config_parse_port_config__ports__server_options(void 
*data)
 /* If we're not configured to be a bridge, but we set
  * BridgeDistribution, then options_validate () should return -1. */
 static void
-test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
+test_config_check_bridge_distribution_setting_not_a_bridge(void *arg)
+{
   or_options_t* options = get_options_mutable();
   or_options_t* old_options = options;
   or_options_t* default_options = options;
@@ -4914,7 +4915,8 @@ 
test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
 
 /* If the BridgeDistribution setting was valid, 0 should be returned. */
 static void
-test_config_check_bridge_distribution_setting_valid(void *arg) {
+test_config_check_bridge_distribution_setting_valid(void *arg)
+{
   int ret = check_bridge_distribution_setting("https");
 
   (void)arg;
@@ -4926,7 +4928,8 @@ test_config_check_bridge_distribution_setting_valid(void 
*arg) {
 
 /* If the BridgeDistribution setting was invalid, -1 should be returned. */
 static void
-test_config_check_bridge_distribution_setting_invalid(void *arg) {
+test_config_check_bridge_distribution_setting_invalid(void *arg)
+{
   int ret = check_bridge_distribution_setting("hyphens-are-allowed");
 
   (void)arg;
@@ -4943,7 +4946,8 @@ 
test_config_check_bridge_distribution_setting_invalid(void *arg) {
 /* If the BridgeDistribution setting was unrecognised, a warning should be
  * logged and 0 should be returned. */
 static void
-test_config_check_bridge_distribution_setting_unrecognised(void *arg) {
+test_config_check_bridge_distribution_setting_unrecognised(void *arg)
+{
   int ret = check_bridge_distribution_setting("unicorn");
 
   (void)arg;
diff --git a/src/test/test_router.c b/src/test/test_router.c
index 64434035e..4e96e2453 100644
--- a/src/test/test_router.c
+++ b/src/test/test_router.c
@@ -22,7 +22,8 @@ NS_DECL(const routerinfo_t *, router_get_my_routerinfo, 
(void));
 static routerinfo_t* mock_routerinfo;
 
 static const routerinfo_t*
-NS(router_get_my_routerinfo)(void) {
+NS(router_get_my_routerinfo)(void)
+{
   crypto_pk_t* ident_key;
   crypto_pk_t* tap_key;
   time_t now;
@@ -57,7 +58,8 @@ NS(router_get_my_routerinfo)(void) {
 /* If no distribution option was set, then check_bridge_distribution_setting()
  * should have set it to "any". */
 static void
-test_router_dump_router_to_string_no_bridge_distribution_method(void *arg) {
+test_router_dump_router_to_string_no_bridge_distribution_method(void *arg)
+{
   const char* needle = "bridge-distribution-request any";
   or_options_t* options = get_options_mutable();
   routerinfo_t* router = NULL;
@@ -107,3 +109,4 @@ struct testcase_t router_tests[] = {
   ROUTER_TEST(dump_router_to_string_no_bridge_distribution_method, TT_FORK),
   END_OF_TESTCASES
 };
+



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] doc: Improve documentation for check_bridge_distribution_setting().

2017-10-24 Thread nickm 
commit b0e10f23ba2b03f275ef4acf2183a02042e6cded
Author: Isis Lovecruft 
Date:   Mon Oct 23 19:37:52 2017 +

doc: Improve documentation for check_bridge_distribution_setting().
---
 src/or/config.c | 22 --
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 7f45bb2cb..4d08a0795 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6350,8 +6350,26 @@ warn_client_dns_cache(const char *option, int disabling)
   "to your destination.");
 }
 
-/** Warn if bd is an unrecognized bridge distribution setting;
- * return -1 if it is invalid. */
+/**
+ * Validate the configured bridge distribution method from a BridgeDistribution
+ * config line.
+ *
+ * The input bd, is a string taken from the BridgeDistribution config
+ * line (if present).  If the option wasn't set, return 0 immediately.  The
+ * BridgeDistribution option is then validated.  Currently valid, recognised
+ * options are:
+ *
+ * - "none"
+ * - "any"
+ * - "https"
+ * - "email"
+ * - "moat"
+ * - "hyphae"
+ *
+ * If the option string is unrecognised, a warning will be logged and 0 is
+ * returned.  If the option string contains an invalid character, -1 is
+ * returned.
+ **/
 static int
 check_bridge_distribution_setting(const char *bd)
 {



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Tweak the documentation for BridgeDistribution

2017-10-24 Thread nickm 
commit 3581f93d273dfd9fbc56de907b7e3b77575614e1
Author: Nick Mathewson 
Date:   Mon Oct 23 10:38:19 2017 -0400

Tweak the documentation for BridgeDistribution

Note that it will have no effect yet; note that the default is
"any".
---
 changes/feature18329 | 5 -
 doc/tor.1.txt| 7 ++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/changes/feature18329 b/changes/feature18329
index 7fdb659e8..f534c7614 100644
--- a/changes/feature18329
+++ b/changes/feature18329
@@ -2,5 +2,8 @@
 - Bridge relays can now set the BridgeDistribution config option to
   add a "bridge-distribution-request" line to their bridge descriptor,
   which tells BridgeDB how they'd like their bridge address to be
-  given out. Implements tickets 18329.
+  given out. (Note that as of Oct 2017, BridgeDB does not yet implement
+  this feature.) As a side benefit, this feature provides a way
+  to distinguish bridge descriptors from non-bridge descriptors.
+  Implements tickets 18329.
 
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 7da5ba3fe..52e81860b 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1651,7 +1651,12 @@ is non-zero):
 If set along with BridgeRelay, Tor will include a new line in its
 bridge descriptor which indicates to the BridgeDB service how it
 would like its bridge address to be given out. Set it to "none" if
-you want BridgeDB to avoid distributing your bridge address.
+you want BridgeDB to avoid distributing your bridge address, or "any" to
+let BridgeDB decide. (Default: any)
+ +
+Note: as of Oct 2017, the BridgeDB part of this option is not yet
+implemented.  Until BridgeDB is updated to obey this option, your
+bridge will make this request, but it will not (yet) be obeyed.
 
 [[ContactInfo]] **ContactInfo** __email_address__::
 Administrative contact information for this relay or bridge. This line



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] Add new BridgeDistribution config option

2017-10-24 Thread nickm 
commit ebab5215252f9fa810ae091c335c5ae6e619faaf
Author: Roger Dingledine 
Date:   Sun Nov 13 02:39:16 2016 -0500

Add new BridgeDistribution config option

Bridge relays can use it to add a "bridge-distribution-request" line
to their bridge descriptor, which tells BridgeDB how they'd like their
bridge address to be given out.

Implements tickets 18329.
---
 changes/feature18329 | 6 ++
 doc/tor.1.txt| 6 ++
 src/or/config.c  | 7 +++
 src/or/or.h  | 4 
 src/or/router.c  | 8 
 5 files changed, 31 insertions(+)

diff --git a/changes/feature18329 b/changes/feature18329
new file mode 100644
index 0..7fdb659e8
--- /dev/null
+++ b/changes/feature18329
@@ -0,0 +1,6 @@
+  o Minor features:
+- Bridge relays can now set the BridgeDistribution config option to
+  add a "bridge-distribution-request" line to their bridge descriptor,
+  which tells BridgeDB how they'd like their bridge address to be
+  given out. Implements tickets 18329.
+
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index f1068cedc..7da5ba3fe 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1647,6 +1647,12 @@ is non-zero):
 server descriptor to the bridge database, rather than
 to the public directory authorities.
 
+[[BridgeDistribution]] **BridgeDistribution** __string__::
+If set along with BridgeRelay, Tor will include a new line in its
+bridge descriptor which indicates to the BridgeDB service how it
+would like its bridge address to be given out. Set it to "none" if
+you want BridgeDB to avoid distributing your bridge address.
+
 [[ContactInfo]] **ContactInfo** __email_address__::
 Administrative contact information for this relay or bridge. This line
 can be used to contact you if your relay or bridge is misconfigured or
diff --git a/src/or/config.c b/src/or/config.c
index 08cc5cdf5..1bdfdf484 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -182,6 +182,7 @@ static config_var_t option_vars_[] = {
   V(BridgePassword,  STRING,   NULL),
   V(BridgeRecordUsageByCountry,  BOOL, "1"),
   V(BridgeRelay, BOOL, "0"),
+  V(BridgeDistribution,  STRING,   NULL),
   V(CellStatistics,  BOOL, "0"),
   V(LearnCircuitBuildTimeout,BOOL, "1"),
   V(CircuitBuildTimeout, INTERVAL, "0"),
@@ -3346,6 +3347,10 @@ options_validate(or_options_t *old_options, or_options_t 
*options,
 options->DirPort_set = 0;
   }
 
+  if (options->BridgeDistribution && !options->BridgeRelay) {
+REJECT("You have set BridgeDistribution, yet you didn't set BridgeRelay!");
+  }
+
   if (options->MinUptimeHidServDirectoryV2 < 0) {
 log_warn(LD_CONFIG, "MinUptimeHidServDirectoryV2 option must be at "
 "least 0 seconds. Changing to 0.");
@@ -4497,6 +4502,8 @@ options_transition_affects_descriptor(const or_options_t 
*old_options,
   get_effective_bwburst(old_options) !=
 get_effective_bwburst(new_options) ||
   !opt_streq(old_options->ContactInfo, new_options->ContactInfo) ||
+  !opt_streq(old_options->BridgeDistribution,
+ new_options->BridgeDistribution) ||
   !opt_streq(old_options->MyFamily, new_options->MyFamily) ||
   !opt_streq(old_options->AccountingStart, new_options->AccountingStart) ||
   old_options->AccountingMax != new_options->AccountingMax ||
diff --git a/src/or/or.h b/src/or/or.h
index 33fe8b96c..3d61cfa05 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3638,6 +3638,10 @@ typedef struct {
   int BridgeAuthoritativeDir; /**< Boolean: is this an authoritative directory
* that aggregates bridge descriptors? */
 
+  /** If set on a bridge relay, it will include this value on a new
+   * "bridge-distribution-request" line in its bridge descriptor. */
+  char *BridgeDistribution;
+
   /** If set on a bridge authority, it will answer requests on its dirport
* for bridge statuses -- but only if the requests use this password. */
   char *BridgePassword;
diff --git a/src/or/router.c b/src/or/router.c
index 6d3a32a60..780d0444f 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -2867,6 +2867,14 @@ router_dump_router_to_string(routerinfo_t *router,
 smartlist_add_asprintf(chunks, "contact %s\n", ci);
   }
 
+  if (options->BridgeRelay && options->BridgeDistribution &&
+  strlen(options->BridgeDistribution)) {
+const char *bd = options->BridgeDistribution;
+if (strchr(bd, '\n') || strchr(bd, '\r'))
+  bd = escaped(bd);
+smartlist_add_asprintf(chunks, "bridge-distribution-request %s\n", bd);
+  }
+
   if (router->onion_curve25519_pkey) {
 char kbuf[128];
 base64_encode(kbuf, sizeof(kbuf),



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.2] test: Add unittest for descriptors with BridgeDistribution option.

2017-10-24 Thread nickm 
commit 02cde0d9398c43de3a67133b7982d9df6962fe32
Author: Isis Lovecruft 
Date:   Mon Oct 23 19:44:06 2017 +

test: Add unittest for descriptors with BridgeDistribution option.
---
 src/or/config.c|   3 +-
 src/or/config.h|   1 +
 src/test/include.am|   1 +
 src/test/test.c|   1 +
 src/test/test_config.c |  63 
 src/test/test_router.c | 109 +
 6 files changed, 176 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 4d08a0795..0b1e6bed1 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -654,7 +654,6 @@ static int parse_ports(or_options_t *options, int 
validate_only,
 static int check_server_ports(const smartlist_t *ports,
   const or_options_t *options,
   int *num_low_ports_out);
-static int check_bridge_distribution_setting(const char *bd);
 static int validate_data_directory(or_options_t *options);
 static int write_configuration_file(const char *fname,
 const or_options_t *options);
@@ -6370,7 +6369,7 @@ warn_client_dns_cache(const char *option, int disabling)
  * returned.  If the option string contains an invalid character, -1 is
  * returned.
  **/
-static int
+STATIC int
 check_bridge_distribution_setting(const char *bd)
 {
   if (bd == NULL)
diff --git a/src/or/config.h b/src/or/config.h
index 664553251..096937cb6 100644
--- a/src/or/config.h
+++ b/src/or/config.h
@@ -199,6 +199,7 @@ STATIC int parse_port_config(smartlist_t *out,
   const char *defaultaddr,
   int defaultport,
   const unsigned flags);
+STATIC int check_bridge_distribution_setting(const char *bd);
 #endif
 
 #endif
diff --git a/src/test/include.am b/src/test/include.am
index 8ecfaf10c..6cefc6c5a 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -115,6 +115,7 @@ src_test_test_SOURCES = \
src/test/test_relaycell.c \
src/test/test_rendcache.c \
src/test/test_replay.c \
+   src/test/test_router.c \
src/test/test_routerkeys.c \
src/test/test_routerlist.c \
src/test/test_routerset.c \
diff --git a/src/test/test.c b/src/test/test.c
index 9a41b976b..733732609 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1220,6 +1220,7 @@ struct testgroup_t testgroups[] = {
   { "relaycell/", relaycell_tests },
   { "rend_cache/", rend_cache_tests },
   { "replaycache/", replaycache_tests },
+  { "router/", router_tests },
   { "routerkeys/", routerkeys_tests },
   { "routerlist/", routerlist_tests },
   { "routerset/" , routerset_tests },
diff --git a/src/test/test_config.c b/src/test/test_config.c
index 89f9b3e2a..396f06adf 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -4890,6 +4890,65 @@ 
test_config_parse_port_config__ports__server_options(void *data)
   config_free_lines(config_port_valid); config_port_valid = NULL;
 }
 
+/* If we're not configured to be a bridge, but we set
+ * BridgeDistribution, then options_validate () should return -1. */
+static void
+test_config_check_bridge_distribution_setting_not_a_bridge(void *arg) {
+  or_options_t* options = get_options_mutable();
+  or_options_t* old_options = options;
+  or_options_t* default_options = options;
+  char* message = (char*)("");
+  int ret;
+
+  (void)arg;
+
+  options->BridgeRelay = 0;
+  options->BridgeDistribution = (char*)("https");
+
+  ret = options_validate(old_options, options, default_options, 0, );
+
+  tt_int_op(ret, OP_EQ, -1);
+ done:
+  return;
+}
+
+/* If the BridgeDistribution setting was valid, 0 should be returned. */
+static void
+test_config_check_bridge_distribution_setting_valid(void *arg) {
+  int ret = check_bridge_distribution_setting("https");
+
+  (void)arg;
+
+  tt_int_op(ret, OP_EQ, 0);
+ done:
+  return;
+}
+
+/* If the BridgeDistribution setting was invalid, -1 should be returned. */
+static void
+test_config_check_bridge_distribution_setting_invalid(void *arg) {
+  int ret = check_bridge_distribution_setting("hyphens-are-not-allowed");
+
+  (void)arg;
+
+  tt_int_op(ret, OP_EQ, -1);
+ done:
+  return;
+}
+
+/* If the BridgeDistribution setting was unrecognised, a warning should be
+ * logged and 0 should be returned. */
+static void
+test_config_check_bridge_distribution_setting_unrecognised(void *arg) {
+  int ret = check_bridge_distribution_setting("unicorn");
+
+  (void)arg;
+
+  tt_int_op(ret, OP_EQ, 0);
+ done:
+  return;
+}
+
 #define CONFIG_TEST(name, flags)  \
   { #name, test_config_ ## name, flags, NULL, NULL }
 
@@ -4916,6 +4975,10 @@ struct testcase_t config_tests[] = {
   CONFIG_TEST(parse_port_config__ports__no_ports_given, 0),
   CONFIG_TEST(parse_port_config__ports__server_options, 0),
   CONFIG_TEST(parse_port_config__ports__ports_given, 0),
+  CONFIG_TEST(check_bridge_distribution_setting_not_a_bridge, TT_FORK),
+

[tor-commits] [nyx/master] Fix unit tests

2017-10-24 Thread atagar 
commit c6c16ebc42908f56d064711492da6787c946c493
Author: Damian Johnson 
Date:   Tue Oct 24 10:17:43 2017 -0700

Fix unit tests

Lots of breakages have slipped in while attempting to improve our 
performance.
Most were timing related due to our switch to static sleeps.
---
 nyx/__init__.py|  1 +
 nyx/panel/__init__.py  |  5 ++---
 nyx/panel/connection.py| 10 +++---
 nyx/panel/header.py|  4 ++--
 nyx/tracker.py | 11 ++-
 run_tests.py   |  2 +-
 test/panel/connection.py   |  4 ++--
 test/panel/header.py   |  2 +-
 test/tracker/connection_tracker.py |  8 
 test/tracker/port_usage_tracker.py |  2 +-
 test/tracker/resource_tracker.py   |  2 +-
 11 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/nyx/__init__.py b/nyx/__init__.py
index d9a9b52..5947294 100644
--- a/nyx/__init__.py
+++ b/nyx/__init__.py
@@ -268,6 +268,7 @@ def our_address(default = None):
 
   return CACHED_ADDRESS if CACHED_ADDRESS is not None else default
 
+
 def show_message(message = None, *attr, **kwargs):
   """
   Shows a message in our header.
diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py
index ed32887..b75964c 100644
--- a/nyx/panel/__init__.py
+++ b/nyx/panel/__init__.py
@@ -31,10 +31,9 @@ import inspect
 import threading
 import time
 
+import nyx
 import nyx.curses
 
-from nyx import PAUSE_TIME, nyx_interface
-
 __all__ = [
   'config',
   'connection',
@@ -207,7 +206,7 @@ class DaemonPanel(Panel, threading.Thread):
 sleep_until = last_ran + self._update_rate + 0.1
 
 while not self._halt and time.time() < sleep_until:
-  time.sleep(PAUSE_TIME)
+  time.sleep(nyx.PAUSE_TIME)
 
 continue  # done waiting, try again
 
diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py
index 3fe283b..3002d67 100644
--- a/nyx/panel/connection.py
+++ b/nyx/panel/connection.py
@@ -11,12 +11,13 @@ import itertools
 import re
 import time
 
+import nyx
 import nyx.curses
 import nyx.panel
 import nyx.popups
 import nyx.tracker
 
-from nyx import PAUSE_TIME, nyx_interface, tor_controller, our_address
+from nyx import nyx_interface, tor_controller
 from nyx.curses import WHITE, NORMAL, BOLD, HIGHLIGHT
 from nyx.menu import MenuItem, Submenu, RadioMenuItem, RadioGroup
 
@@ -505,7 +506,7 @@ class ConnectionPanel(nyx.panel.DaemonPanel):
 elif self._halt:
   return
 else:
-  time.sleep(PAUSE_TIME)
+  time.sleep(nyx.PAUSE_TIME)
 
 controller = tor_controller()
 LAST_RETRIEVED_CIRCUITS = controller.get_circuits([])
@@ -607,7 +608,10 @@ def _draw_line(subwindow, x, y, line, is_selected, width, 
current_time):
 
 
 def _draw_address_column(subwindow, x, y, line, attr):
-  src = '%s:%s' % (our_address(line.connection.local_address), 
line.connection.local_port if line.line_type == LineType.CONNECTION else '')
+  if line.line_type == LineType.CONNECTION:
+src = '%s:%s' % (nyx.our_address(line.connection.local_address), 
line.connection.local_port)
+  else:
+src = nyx.our_address(line.connection.local_address)
 
   if line.line_type == LineType.CIRCUIT_HEADER and line.circuit.status != 
'BUILT':
 dst = 'Building...'
diff --git a/nyx/panel/header.py b/nyx/panel/header.py
index 3751d56..0820a21 100644
--- a/nyx/panel/header.py
+++ b/nyx/panel/header.py
@@ -23,7 +23,7 @@ import nyx.popups
 import nyx.tracker
 
 from stem.util import conf, log
-from nyx import nyx_interface, tor_controller, our_address
+from nyx import nyx_interface, tor_controller
 
 from nyx.curses import RED, GREEN, YELLOW, CYAN, WHITE, BOLD, HIGHLIGHT
 
@@ -268,7 +268,7 @@ class Sampling(object):
   'version': str(controller.get_version('Unknown')).split()[0],
   'version_status': controller.get_info('status/version/current', 
'Unknown'),
 
-  'address': or_listeners[0][0] if (or_listeners and or_listeners[0][0] != 
'0.0.0.0') else our_address('Unknown'),
+  'address': or_listeners[0][0] if (or_listeners and or_listeners[0][0] != 
'0.0.0.0') else nyx.our_address('Unknown'),
   'or_port': or_listeners[0][1] if or_listeners else '',
   'dir_port': controller.get_conf('DirPort', '0'),
   'control_port': str(control_listeners[0][1]) if control_listeners else 
None,
diff --git a/nyx/tracker.py b/nyx/tracker.py
index 6d6ab64..fb41f9e 100644
--- a/nyx/tracker.py
+++ b/nyx/tracker.py
@@ -60,7 +60,7 @@ import stem.control
 import stem.descriptor.router_status_entry
 import stem.util.log
 
-from nyx import PAUSE_TIME, tor_controller, our_address
+from nyx import tor_controller
 from stem.util import conf, connection, enum, proc, str_tools, system
 
 CONFIG = conf.config_dict('nyx', {
@@ -387,10 +387,10 @@ class Daemon(threading.Thread):
   def run(self):
 while not self._halt:
   if self._is_paused or time.time() - self._last_ran < self._rate:
-sleep_until =

[tor-commits] [tor/master] Repair "make check"

2017-10-24 Thread nickm 
commit f709dce414b8a8ebe95026a9e3fa763acdb17aff
Author: Nick Mathewson 
Date:   Tue Oct 24 12:54:21 2017 -0400

Repair "make check"
---
 changes/ticket23637 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changes/ticket23637 b/changes/ticket23637
index 8687ab1a0..0c524f34c 100644
--- a/changes/ticket23637
+++ b/changes/ticket23637
@@ -1,4 +1,4 @@
-  o Minor features:
+  o Minor features (directory authority):
 - Make the "Exit" flag assignment only depend on whether the exit
   policy allows connections to ports 80 and 443. Previously relays
   would get the Exit flag if they allowed connections to one of

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Assign Exit flag only for ports 80 and 443

2017-10-24 Thread nickm 
commit 8dff23eb34cf63278f8c78eb965c77fe215b860c
Author: Roger Dingledine 
Date:   Sun Sep 24 19:27:07 2017 -0400

Assign Exit flag only for ports 80 and 443

Make the "Exit" flag assignment only depend on whether the exit
policy allows connections to ports 80 and 443. Previously relays
would get the Exit flag if they allowed connections to one of
these ports and also port 6667.

Resolves ticket 23637.
---
 changes/ticket23637 |  5 +
 src/or/policies.c   | 13 -
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/changes/ticket23637 b/changes/ticket23637
new file mode 100644
index 0..8687ab1a0
--- /dev/null
+++ b/changes/ticket23637
@@ -0,0 +1,5 @@
+  o Minor features:
+- Make the "Exit" flag assignment only depend on whether the exit
+  policy allows connections to ports 80 and 443. Previously relays
+  would get the Exit flag if they allowed connections to one of
+  these ports and also port 6667. Resolves ticket 23637.
diff --git a/src/or/policies.c b/src/or/policies.c
index 4c24bfbc3..78451db8f 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -2186,21 +2186,16 @@ exit_policy_is_general_exit_helper(smartlist_t *policy, 
int port)
 }
 
 /** Return true iff ri is "useful as an exit node", meaning
- * it allows exit to at least one /8 address space for at least
- * two of ports 80, 443, and 6667. */
+ * it allows exit to at least one /8 address space for each of ports 80
+ * and 443. */
 int
 exit_policy_is_general_exit(smartlist_t *policy)
 {
-  static const int ports[] = { 80, 443, 6667 };
-  int n_allowed = 0;
-  int i;
   if (!policy) /* disallow NULL policies? */
 return 0;
 
-  for (i = 0; i < 3; ++i) {
-n_allowed += exit_policy_is_general_exit_helper(policy, ports[i]);
-  }
-  return n_allowed >= 2;
+  return (exit_policy_is_general_exit_helper(policy, 80) &&
+  exit_policy_is_general_exit_helper(policy, 443));
 }
 
 /** Return false if policy might permit access to some addr:port;



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge remote-tracking branch 'arma/ticket23637'

2017-10-24 Thread nickm 
commit 649000662d3b5f7000c9a4b06444f154e3b0628d
Merge: 350fecfaf 8dff23eb3
Author: Nick Mathewson 
Date:   Tue Oct 24 12:52:41 2017 -0400

Merge remote-tracking branch 'arma/ticket23637'

 changes/ticket23637 |  5 +
 src/or/policies.c   | 13 -
 2 files changed, 9 insertions(+), 9 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] assign Exit flag differently (from ticket 23637)

2017-10-24 Thread nickm 
commit 4bc533ed4c49d7bedaec7ef272d8cb481eb5bc92
Author: Roger Dingledine 
Date:   Sun Sep 24 19:36:16 2017 -0400

assign Exit flag differently (from ticket 23637)
---
 dir-spec.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dir-spec.txt b/dir-spec.txt
index bb34292..4a2573e 100644
--- a/dir-spec.txt
+++ b/dir-spec.txt
@@ -2351,8 +2351,9 @@
 [ what happens when we have less than 4 days of MTBF info.]
 
"Exit" -- A router is called an 'Exit' iff it allows exits to at
-   least two of the ports 80, 443, and 6667 and allows exits to at
-   least one /8 address space.
+   least one /8 address space on each of ports 80 and 443. (Up until
+   Tor version 0.3.2, the flag was assigned if relays exit to at least
+   two of the ports 80, 443, and 6667.)
 
"Fast" -- A router is 'Fast' if it is active, and its bandwidth is either in
the top 7/8ths for known active routers or at least 100KB/s.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [torspec/master] Merge remote-tracking branch 'arma/ticket23637-spec'

2017-10-24 Thread nickm 
commit 42065cfb2925f3f0eb4a5b190feef2210228b44b
Merge: c912116 4bc533e
Author: Nick Mathewson 
Date:   Tue Oct 24 12:53:16 2017 -0400

Merge remote-tracking branch 'arma/ticket23637-spec'

 dir-spec.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere_completed] Update translations for https_everywhere_completed

2017-10-24 Thread translation 
commit 4b7ef9b79057057639759da3a0eef61168507f89
Author: Translation commit bot 
Date:   Tue Oct 24 15:45:53 2017 +

Update translations for https_everywhere_completed
---
 th/https-everywhere.dtd | 61 +++--
 1 file changed, 23 insertions(+), 38 deletions(-)

diff --git a/th/https-everywhere.dtd b/th/https-everywhere.dtd
index 93d99c7c2..15eef8316 100644
--- a/th/https-everywhere.dtd
+++ b/th/https-everywhere.dtd
@@ -2,49 +2,34 @@
 
 
 
-
-
-
-
-
-
-
-
+
 
-
+
 
 
-
-
+
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
 
-
-
-
-
-
-
+
+
 
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/https_everywhere] Update translations for https_everywhere

2017-10-24 Thread translation 
commit 71e15cdd7b6bbb2370035dce9b33551f55fcde9e
Author: Translation commit bot 
Date:   Tue Oct 24 15:45:41 2017 +

Update translations for https_everywhere
---
 th/https-everywhere.dtd | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/th/https-everywhere.dtd b/th/https-everywhere.dtd
index 4437908a0..15eef8316 100644
--- a/th/https-everywhere.dtd
+++ b/th/https-everywhere.dtd
@@ -20,16 +20,16 @@
 
 
 
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
 
-
+
 
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Add missing servlet and JSP for new Services page.

2017-10-24 Thread karsten 
commit bc255c85113f1559e27d636c120a8f603988a8d9
Author: Karsten Loesing 
Date:   Tue Oct 24 16:51:57 2017 +0200

Add missing servlet and JSP for new Services page.
---
 .../torproject/metrics/web/ServicesServlet.java| 30 +
 .../src/main/resources/web/WEB-INF/services.jsp| 51 ++
 2 files changed, 81 insertions(+)

diff --git 
a/website/src/main/java/org/torproject/metrics/web/ServicesServlet.java 
b/website/src/main/java/org/torproject/metrics/web/ServicesServlet.java
new file mode 100644
index 000..c96f22c
--- /dev/null
+++ b/website/src/main/java/org/torproject/metrics/web/ServicesServlet.java
@@ -0,0 +1,30 @@
+/* Copyright 2017 The Tor Project
+ * See LICENSE for licensing information */
+
+package org.torproject.metrics.web;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public class ServicesServlet extends AnyServlet {
+
+  private static final long serialVersionUID = 516625494518844400L;
+
+  @Override
+  public void init() throws ServletException {
+super.init();
+  }
+
+  @Override
+  public void doGet(HttpServletRequest request,
+  HttpServletResponse response) throws IOException, ServletException {
+
+request.setAttribute("categories", this.categories);
+request.getRequestDispatcher("WEB-INF/services.jsp").forward(request,
+response);
+  }
+}
+
diff --git a/website/src/main/resources/web/WEB-INF/services.jsp 
b/website/src/main/resources/web/WEB-INF/services.jsp
new file mode 100644
index 000..5eac330
--- /dev/null
+++ b/website/src/main/resources/web/WEB-INF/services.jsp
@@ -0,0 +1,51 @@
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core; %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions; %>
+
+  
+  
+
+
+
+  
+Home
+Services
+  
+
+
+
+  Services #
+  You're running a Tor relay or bridge, or you're affected in some way 
by somebody else running one?  With the following services you can learn 
everything about currently running Tor nodes or even about nodes that have been 
running in the past.
+
+
+
+  Network archive #
+  The following tool lets you browse the network archive for relays 
running in the past.
+  
+https://exonerator.torproject.org/; 
target="_blank">ExoneraTor tells you if an IP was used by a Tor relay on a 
given date.
+  
+
+
+
+  Network status #
+  The following tools let you explore currently running relays and 
bridges.
+  
+https://atlas.torproject.org/; target="_blank">Atlas 
displays data about single relays and bridges in the Tor network.
+https://compass.torproject.org/; 
target="_blank">Compass groups current relays in different ways to measure 
Tor's network diversity.
+https://consensus-health.torproject.org/; 
target="_blank">Consensus Health displays information about the current 
directory consensus and votes.
+https://duckduckgo.com/; target="_blank">DuckDuckGo 
displays Tor node details when including the keywords "tor node" in a 
search.
+https://onionview.codeplex.com/; 
target="_blank">OnionView plots the location of active Tor nodes on an 
interactive map of the world.
+https://onionite.now.sh/; target="_blank">Onionite is 
a Progressive Web App to view information on the individual nodes that make up 
the Tor network.
+  
+
+
+
+  Network health notifications #
+  The following tools inform you of any problems with relays and 
bridges.
+  
+https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-consensus-health;
 target="_blank">Consensus Issues emails directory authority operators 
about consensus problems.
+http://lists.infolabe.net/lists/listinfo/infolabe-anomalies; 
target="_blank">OII's anomaly detection system ranks countries by how 
anomalous their Tor usage is.
+  
+
+
+
+

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [metrics-web/master] Rename Operation section to Services.

2017-10-24 Thread karsten 
commit a52850fc04bc3cd1de194691dd9280f78df4bf67
Author: Karsten Loesing 
Date:   Tue Oct 24 16:47:32 2017 +0200

Rename Operation section to Services.

Implements #23716.
---
 website/src/main/resources/etc/web.xml | 11 +
 .../src/main/resources/web/WEB-INF/operation.jsp   | 51 +-
 website/src/main/resources/web/WEB-INF/top.jsp |  2 +-
 3 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/website/src/main/resources/etc/web.xml 
b/website/src/main/resources/etc/web.xml
index 830e8e7..fe7d286 100644
--- a/website/src/main/resources/etc/web.xml
+++ b/website/src/main/resources/etc/web.xml
@@ -262,6 +262,17 @@
   
 
   
+ServicesServlet
+
+  org.torproject.metrics.web.ServicesServlet
+
+  
+  
+ServicesServlet
+/services.html
+  
+
+  
 DevelopmentServlet
 
   org.torproject.metrics.web.DevelopmentServlet
diff --git a/website/src/main/resources/web/WEB-INF/operation.jsp 
b/website/src/main/resources/web/WEB-INF/operation.jsp
index 3c83925..b86c891 100644
--- a/website/src/main/resources/web/WEB-INF/operation.jsp
+++ b/website/src/main/resources/web/WEB-INF/operation.jsp
@@ -5,47 +5,16 @@
   
 
 
-
-  
-Home
-Operation
-  
-
-
-
-  Operation #
-  You're operating a Tor relay or bridge, or you're affected in some 
way by somebody else operating one?  Here you can learn everything about 
currently running Tor nodes or even about nodes that have been running in the 
past.
-
-
-
-  Network archive #
-  The following tool lets you browse the network archive for relays 
running in the past.
-  
-https://exonerator.torproject.org/; 
target="_blank">ExoneraTor tells you if an IP was used by a Tor relay on a 
given date.
-  
-
-
-
-  Network status #
-  The following tools let you explore currently running relays and 
bridges.
-  
-https://atlas.torproject.org/; target="_blank">Atlas 
displays data about single relays and bridges in the Tor network.
-https://compass.torproject.org/; 
target="_blank">Compass groups current relays in different ways to measure 
Tor's network diversity.
-https://consensus-health.torproject.org/; 
target="_blank">Consensus Health displays information about the current 
directory consensus and votes.
-https://duckduckgo.com/; target="_blank">DuckDuckGo 
displays Tor node details when including the keywords "tor node" in a 
search.
-https://onionview.codeplex.com/; 
target="_blank">OnionView plots the location of active Tor nodes on an 
interactive map of the world.
-https://onionite.now.sh/; target="_blank">Onionite is 
a Progressive Web App to view information on the individual nodes that make up 
the Tor network.
-  
-
-
-
-  Network health notifications #
-  The following tools inform you of any problems with relays and 
bridges.
-  
-https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-consensus-health;
 target="_blank">Consensus Issues emails directory authority operators 
about consensus problems.
-http://lists.infolabe.net/lists/listinfo/infolabe-anomalies; 
target="_blank">OII's anomaly detection system ranks countries by how 
anomalous their Tor usage is.
-  
-
+
+  
+
+  Operation
+
+This page has moved to https://metrics.torproject.org/services.html;>https://metrics.torproject.org/services.html.
+Please update any bookmarks and report any links to this page.
+This placeholder page will be removed in the future.
+  
+
 
 
 
diff --git a/website/src/main/resources/web/WEB-INF/top.jsp 
b/website/src/main/resources/web/WEB-INF/top.jsp
index e5e95eb..f7a702f 100644
--- a/website/src/main/resources/web/WEB-INF/top.jsp
+++ b/website/src/main/resources/web/WEB-INF/top.jsp
@@ -88,7 +88,7 @@ document.write('More
  
class="active"> News
  
class="active"> Sources
- 
class="active"> Operation
+ 
class="active"> Services
  
class="active"> Development
  
class="active"> Research
  
class="active"> About

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-24 Thread nickm 
commit 302b5f577dc0840fd9f738d160ef14b88a71b67f
Merge: d913a7317 725f23710
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:24 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" merge to avoid version bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-24 Thread nickm 
commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25
Merge: 5325e7cca 552b62028
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:24 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" merge to avoid version bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

2017-10-24 Thread nickm 
commit 4a49e134bc30ff1ab4693cffc9d88ad993758889
Merge: ee70e2ed6 990322fca
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:38 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] bump version in the other places :/

2017-10-24 Thread nickm 
commit 552b620280d481ec9d5845d1c6584778545d1f85
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:07 2017 -0400

bump version in the other places :/
---
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index df657d38b..cd414dd43 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.9.12-dev"
+!define VERSION "0.2.9.13"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 47992c0d8..a249ba8c5 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.9.12-dev"
+#define VERSION "0.2.9.13"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-24 Thread nickm 
commit 38a58076e921d561fa1e488a4b0f983b12300ca4
Merge: cbb41ddfe 302b5f577
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:30 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid version bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2017-10-24 Thread nickm 
commit cce1a6efa6adbb90566fc6567c82c4410cd76bf9
Merge: 0d4addfc7 38a58076e
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:37 2017 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

"ours" merge to avoid version bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.1' into maint-0.3.2

2017-10-24 Thread nickm 
commit 122a7f8848785e3cefef812749c7ec1844b26402
Merge: cce1a6efa 990322fca
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:38 2017 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] bump version in the other places :/

2017-10-24 Thread nickm 
commit 5325e7ccab70383a629019323ba01d2c9215b5f4
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:17 2017 -0400

bump version in the other places :/
---
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 48a4d8e75..a179d8483 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.0.11-dev"
+!define VERSION "0.3.0.12"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 7399f8178..47a00dc6d 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.0.11-dev"
+#define VERSION "0.3.0.12"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] bump to 0.2.9.13

2017-10-24 Thread nickm 
commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059
Author: Nick Mathewson 
Date:   Tue Oct 24 09:09:26 2017 -0400

bump to 0.2.9.13
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 76140cbd1..786b4b095 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.12-dev])
+AC_INIT([tor],[0.2.9.13])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-24 Thread nickm 
commit 725f2371042b36c151a42e575a5b319d3820126c
Merge: 09d2ae562 912ebf165
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:17 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-24 Thread nickm 
commit 990322fca450d2230067a3035468c5ac7168e760
Merge: 38a58076e 7bebd1b02
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:33 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid version bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-24 Thread nickm 
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 mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-24 Thread nickm 
commit 990322fca450d2230067a3035468c5ac7168e760
Merge: 38a58076e 7bebd1b02
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:33 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid version bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

2017-10-24 Thread nickm 
commit ee70e2ed6df64c10099350ec654dff65db21011c
Merge: af51ac47e 38a58076e
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:42 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] bump to 0.2.8.16

2017-10-24 Thread nickm 
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0
Author: Nick Mathewson 
Date:   Tue Oct 24 09:09:10 2017 -0400

bump to 0.2.8.16
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 55ace93cb..79af3d4b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.15-dev])
+AC_INIT([tor],[0.2.8.16])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] bump to 0.2.8.16

2017-10-24 Thread nickm 
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0
Author: Nick Mathewson 
Date:   Tue Oct 24 09:09:10 2017 -0400

bump to 0.2.8.16
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 55ace93cb..79af3d4b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.15-dev])
+AC_INIT([tor],[0.2.8.16])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] bump version in the other places :/

2017-10-24 Thread nickm 
commit 552b620280d481ec9d5845d1c6584778545d1f85
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:07 2017 -0400

bump version in the other places :/
---
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index df657d38b..cd414dd43 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.9.12-dev"
+!define VERSION "0.2.9.13"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 47992c0d8..a249ba8c5 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.9.12-dev"
+#define VERSION "0.2.9.13"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] bump to 0.3.0.12

2017-10-24 Thread nickm 
commit d913a7317bf205d580cde70a0b58010295fe6c4c
Author: Nick Mathewson 
Date:   Tue Oct 24 09:09:35 2017 -0400

bump to 0.3.0.12
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3f36da739..60d4cc784 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.0.11-dev])
+AC_INIT([tor],[0.3.0.12])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-24 Thread nickm 
commit 725f2371042b36c151a42e575a5b319d3820126c
Merge: 09d2ae562 912ebf165
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:17 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] bump to 0.3.1.8

2017-10-24 Thread nickm 
commit cbb41ddfef3398e2aefef952b491610864f9670d
Author: Nick Mathewson 
Date:   Tue Oct 24 09:09:50 2017 -0400

bump to 0.3.1.8
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index ecff48f85..eeec24e1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.1.7-dev])
+AC_INIT([tor],[0.3.1.8])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 0373af313..a8c8de99e 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.1.7-dev"
+!define VERSION "0.3.1.8"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index e74d54a72..0de6aa2be 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.1.7-dev"
+#define VERSION "0.3.1.8"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

2017-10-24 Thread nickm 
commit 7e3d5312ede31d4fa66d260de8f5dedf8cf1
Merge: a574ab8e2 552b62028
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:38 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] bump to 0.2.5.15

2017-10-24 Thread nickm 
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f
Author: Nick Mathewson 
Date:   Tue Oct 24 09:09:00 2017 -0400

bump to 0.2.5.15
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4eeb34dca..f989534a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2013, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
-AC_INIT([tor],[0.2.5.14-dev])
+AC_INIT([tor],[0.2.5.15])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index af09326f1..519a73d2c 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.5.14-dev"
+!define VERSION "0.2.5.15"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5e670c35c..6cbd31e52 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.5.14-dev"
+#define VERSION "0.2.5.15"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] bump to 0.3.0.12

2017-10-24 Thread nickm 
commit d913a7317bf205d580cde70a0b58010295fe6c4c
Author: Nick Mathewson 
Date:   Tue Oct 24 09:09:35 2017 -0400

bump to 0.3.0.12
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 3f36da739..60d4cc784 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.0.11-dev])
+AC_INIT([tor],[0.3.0.12])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-24 Thread nickm 
commit 302b5f577dc0840fd9f738d160ef14b88a71b67f
Merge: d913a7317 725f23710
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:24 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" merge to avoid version bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0

2017-10-24 Thread nickm 
commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25
Merge: 5325e7cca 552b62028
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:24 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

"ours" merge to avoid version bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] bump version in the other places :/

2017-10-24 Thread nickm 
commit 5325e7ccab70383a629019323ba01d2c9215b5f4
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:17 2017 -0400

bump version in the other places :/
---
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 48a4d8e75..a179d8483 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.0.11-dev"
+!define VERSION "0.3.0.12"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 7399f8178..47a00dc6d 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.0.11-dev"
+#define VERSION "0.3.0.12"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.2] bump to 0.2.5.15

2017-10-24 Thread nickm 
commit 743eee4930e7f5e37e18cc0f81e86133ab62885f
Author: Nick Mathewson 
Date:   Tue Oct 24 09:09:00 2017 -0400

bump to 0.2.5.15
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4eeb34dca..f989534a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson
 dnl Copyright (c) 2007-2013, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
-AC_INIT([tor],[0.2.5.14-dev])
+AC_INIT([tor],[0.2.5.15])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index af09326f1..519a73d2c 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.5.14-dev"
+!define VERSION "0.2.5.15"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 5e670c35c..6cbd31e52 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -241,7 +241,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.5.14-dev"
+#define VERSION "0.2.5.15"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

2017-10-24 Thread nickm 
commit 38a58076e921d561fa1e488a4b0f983b12300ca4
Merge: cbb41ddfe 302b5f577
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:30 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

"ours" merge to avoid version bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] bump to 0.2.9.13

2017-10-24 Thread nickm 
commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059
Author: Nick Mathewson 
Date:   Tue Oct 24 09:09:26 2017 -0400

bump to 0.2.9.13
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 76140cbd1..786b4b095 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.12-dev])
+AC_INIT([tor],[0.2.9.13])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.2.5' into maint-0.2.8

2017-10-24 Thread nickm 
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 mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.1] bump to 0.3.1.8

2017-10-24 Thread nickm 
commit cbb41ddfef3398e2aefef952b491610864f9670d
Author: Nick Mathewson 
Date:   Tue Oct 24 09:09:50 2017 -0400

bump to 0.3.1.8
---
 configure.ac| 2 +-
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index ecff48f85..eeec24e1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.3.1.7-dev])
+AC_INIT([tor],[0.3.1.8])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index 0373af313..a8c8de99e 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.3.1.7-dev"
+!define VERSION "0.3.1.8"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index e74d54a72..0de6aa2be 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.3.1.7-dev"
+#define VERSION "0.3.1.8"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.0] bump to 0.2.8.16

2017-10-24 Thread nickm 
commit d4befa035d5caa7a3c71b62cb3f613c36060c9e0
Author: Nick Mathewson 
Date:   Tue Oct 24 09:09:10 2017 -0400

bump to 0.2.8.16
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 55ace93cb..79af3d4b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.8.15-dev])
+AC_INIT([tor],[0.2.8.16])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.0] bump version in the other places :/

2017-10-24 Thread nickm 
commit 552b620280d481ec9d5845d1c6584778545d1f85
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:07 2017 -0400

bump version in the other places :/
---
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index df657d38b..cd414dd43 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.9.12-dev"
+!define VERSION "0.2.9.13"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 47992c0d8..a249ba8c5 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.9.12-dev"
+#define VERSION "0.2.9.13"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.2.9] bump version in the other places :/

2017-10-24 Thread nickm 
commit 552b620280d481ec9d5845d1c6584778545d1f85
Author: Nick Mathewson 
Date:   Tue Oct 24 09:11:07 2017 -0400

bump version in the other places :/
---
 contrib/win32build/tor-mingw.nsi.in | 2 +-
 src/win32/orconfig.h| 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/win32build/tor-mingw.nsi.in 
b/contrib/win32build/tor-mingw.nsi.in
index df657d38b..cd414dd43 100644
--- a/contrib/win32build/tor-mingw.nsi.in
+++ b/contrib/win32build/tor-mingw.nsi.in
@@ -8,7 +8,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
 !insertmacro GetParameters
-!define VERSION "0.2.9.12-dev"
+!define VERSION "0.2.9.13"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/;
 !define LICENSE "LICENSE"
diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h
index 47992c0d8..a249ba8c5 100644
--- a/src/win32/orconfig.h
+++ b/src/win32/orconfig.h
@@ -218,7 +218,7 @@
 #define USING_TWOS_COMPLEMENT
 
 /* Version number of package */
-#define VERSION "0.2.9.12-dev"
+#define VERSION "0.2.9.13"
 
 
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9

2017-10-24 Thread nickm 
commit 725f2371042b36c151a42e575a5b319d3820126c
Merge: 09d2ae562 912ebf165
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:17 2017 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

"ours" merge to avoid version bump




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.0] bump to 0.2.9.13

2017-10-24 Thread nickm 
commit 09d2ae562ac47cfcb92ce5f66bb67ee3b5072059
Author: Nick Mathewson 
Date:   Tue Oct 24 09:09:26 2017 -0400

bump to 0.2.9.13
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 76140cbd1..786b4b095 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2015, The Tor Project, Inc.
 dnl See LICENSE for licensing information
 
 AC_PREREQ([2.63])
-AC_INIT([tor],[0.2.9.12-dev])
+AC_INIT([tor],[0.2.9.13])
 AC_CONFIG_SRCDIR([src/or/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0

2017-10-24 Thread nickm 
commit 0ad7317107ce176bb2221f3d3128ec4b9c3e7bbc
Merge: 2244838ec 302b5f577
Author: Nick Mathewson 
Date:   Tue Oct 24 09:10:42 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

  1   2   3   >