aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/protover.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-02-14 08:20:21 -0500
committerNick Mathewson <nickm@torproject.org>2020-02-14 08:20:21 -0500
commita6509cb86744f8f20bd522c744aecf88474a039f (patch)
treeaf512ce7809d7dd8e4974b35eadf9b971da1a400 /src/core/or/protover.c
parenta010dbf94c061d17b6c0225c1b3e52ca0df84b5e (diff)
parented1ee2001f78549454b6196b932ae9bb4d0fdcba (diff)
downloadtor-a6509cb86744f8f20bd522c744aecf88474a039f.tar.gz
tor-a6509cb86744f8f20bd522c744aecf88474a039f.zip
Merge remote-tracking branch 'tor-github/pr/1727/head'
Diffstat (limited to 'src/core/or/protover.c')
-rw-r--r--src/core/or/protover.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/or/protover.c b/src/core/or/protover.c
index 523c124a4f..c3f443631b 100644
--- a/src/core/or/protover.c
+++ b/src/core/or/protover.c
@@ -391,6 +391,7 @@ protover_get_supported_protocols(void)
"Cons=1-2 "
"Desc=1-2 "
"DirCache=1-2 "
+ "FlowCtrl=1 "
"HSDir=1-2 "
"HSIntro=3-5 "
"HSRend=1-2 "
@@ -401,9 +402,8 @@ protover_get_supported_protocols(void)
"LinkAuth=3 "
#endif
"Microdesc=1-2 "
- "Relay=1-2 "
"Padding=2 "
- "FlowCtrl=1";
+ "Relay=1-2";
}
/** The protocols from protover_get_supported_protocols(), as parsed into a